You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ms...@apache.org on 2011/05/13 20:57:05 UTC
svn commit: r1102864 - in /myfaces/trinidad/trunk/trinidad-impl/src/main:
java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/
java/org/apache/myfaces/trinidadinternal/resource/
javascript/META-INF/adf/jsLibs/
Author: mstarets
Date: Fri May 13 18:57:05 2011
New Revision: 1102864
URL: http://svn.apache.org/viewvc?rev=1102864&view=rev
Log:
TRINIDAD-2100 - Trinidad's Library Scriptlet Mechansim Should Support More Selective JS Inclusion
Added:
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreFormatScriptsResourceLoader.java
Modified:
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/XhtmlScriptletFactory.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreCommonScriptsResourceLoader.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreRenderKitResourceLoader.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/LocaleElementsResourceLoader.java
myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberConverter.js
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/XhtmlScriptletFactory.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/XhtmlScriptletFactory.java?rev=1102864&r1=1102863&r2=1102864&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/XhtmlScriptletFactory.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/XhtmlScriptletFactory.java Fri May 13 18:57:05 2011
@@ -101,7 +101,7 @@ public class XhtmlScriptletFactory
static
{
_sLocaleScriptlet =
- new AliasedScriptlet(LOCALE_LIB, new String[]{
+ new LibraryScriptlet(LOCALE_LIB, new String[]{
"getUserLanguage()",
"getJavaLanguage()",
"TrConverter()",
@@ -114,11 +114,8 @@ public class XhtmlScriptletFactory
"isUpperCase()",
"isNotUpperCase()",
"isLetter()",
- "getLocaleSymbols()"},
- new String[]
- {
- CORE_LIB
- });
+ "getLocaleSymbols()"}
+ );
// new LocaleInfoScriptlet();
//new DateFormatInfoScriptlet();
@@ -140,7 +137,8 @@ public class XhtmlScriptletFactory
},
new String[]
{
- GlobalVariablesScriptlet.GLOBAL_VARIABLES_KEY
+ GlobalVariablesScriptlet.GLOBAL_VARIABLES_KEY,
+ LOCALE_LIB
})
{
// =-=AEW The Core library needs to be rendered even
@@ -154,7 +152,7 @@ public class XhtmlScriptletFactory
};
_sDateFormatScriptlet =
- new AliasedScriptlet(DATE_FORMAT_LIB,
+ new LibraryScriptlet(DATE_FORMAT_LIB,
new String[]
{
"TrDateTimeConverter()",
@@ -217,7 +215,7 @@ public class XhtmlScriptletFactory
"TableProxy()",
});
_sColorFormatScriptlet =
- new AliasedScriptlet(COLOR_FORMAT_LIB,
+ new LibraryScriptlet(COLOR_FORMAT_LIB,
new String[]
{
"TrColor()",
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreCommonScriptsResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreCommonScriptsResourceLoader.java?rev=1102864&r1=1102863&r2=1102864&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreCommonScriptsResourceLoader.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreCommonScriptsResourceLoader.java Fri May 13 18:57:05 2011
@@ -18,6 +18,9 @@
*/
package org.apache.myfaces.trinidadinternal.resource;
+import java.io.IOException;
+
+import java.net.URL;
import java.net.URLConnection;
import org.apache.myfaces.trinidad.resource.AggregatingResourceLoader;
import org.apache.myfaces.trinidad.resource.ClassLoaderResourceLoader;
@@ -29,10 +32,9 @@ import org.apache.myfaces.trinidad.resou
public class CoreCommonScriptsResourceLoader extends AggregatingResourceLoader
{
public CoreCommonScriptsResourceLoader(
- String path,
boolean debug)
{
- super(path,
+ super("",
debug ? _DEBUG_LIBRARIES : _LIBRARIES,
new ClassLoaderResourceLoader());
@@ -42,6 +44,16 @@ public class CoreCommonScriptsResourceLo
// block comment "/*"
setSeparator(_NEWLINE_SEPARATOR);
}
+
+ /**
+ * Since CoreRenderKitResourceLoader already does the matching, this method is overridden
+ * to just call getURL()
+ */
+ @Override
+ protected URL findResource(String path) throws IOException
+ {
+ return getURL(path);
+ }
@Override
protected String getContentType(
@@ -53,15 +65,8 @@ public class CoreCommonScriptsResourceLo
// List of all libraries
static private final String[] _LIBRARIES =
{
- "META-INF/adf/jsLibs/CharSets.js",
- "META-INF/adf/jsLibs/NumberFormat.js",
- "META-INF/adf/jsLibs/NumberConverter.js",
- "META-INF/adf/jsLibs/CoreFormat.js",
- "META-INF/adf/jsLibs/TrCollections.js",
"META-INF/adf/jsLibs/DateField.js",
"META-INF/adf/jsLibs/DateFieldFormat.js",
- "META-INF/adf/jsLibs/DateFormat.js",
- "META-INF/adf/jsLibs/Locale.js",
"META-INF/adf/jsLibs/MessageBox.js",
"META-INF/adf/jsLibs/Core.js",
"META-INF/adf/jsLibs/Window.js",
@@ -70,7 +75,6 @@ public class CoreCommonScriptsResourceLo
"META-INF/adf/jsLibs/Poll.js",
"META-INF/adf/jsLibs/ColorField.js",
"META-INF/adf/jsLibs/ColorFieldFormat.js",
- "META-INF/adf/jsLibs/ColorFormat.js",
"META-INF/adf/jsLibs/Shuttle.js",
"META-INF/adf/jsLibs/PanelPopup.js",
"META-INF/adf/jsLibs/PopupDialog.js",
@@ -86,14 +90,14 @@ public class CoreCommonScriptsResourceLo
// List of all libraries
static private final String[] _DEBUG_LIBRARIES =
{
- "META-INF/adf/jsLibsDebug/CharSets.js",
- "META-INF/adf/jsLibsDebug/NumberFormat.js",
- "META-INF/adf/jsLibsDebug/NumberConverter.js",
+ //"META-INF/adf/jsLibsDebug/CharSets.js",
+ //"META-INF/adf/jsLibsDebug/NumberFormat.js",
+ //"META-INF/adf/jsLibsDebug/NumberConverter.js",
"META-INF/adf/jsLibsDebug/TrCollections.js",
- "META-INF/adf/jsLibsDebug/CoreFormat.js",
+ //"META-INF/adf/jsLibsDebug/CoreFormat.js",
"META-INF/adf/jsLibsDebug/DateField.js",
"META-INF/adf/jsLibsDebug/DateFieldFormat.js",
- "META-INF/adf/jsLibsDebug/DateFormat.js",
+ //"META-INF/adf/jsLibsDebug/DateFormat.js",
"META-INF/adf/jsLibsDebug/Locale.js",
"META-INF/adf/jsLibsDebug/MessageBox.js",
"META-INF/adf/jsLibsDebug/Core.js",
@@ -103,7 +107,7 @@ public class CoreCommonScriptsResourceLo
"META-INF/adf/jsLibsDebug/Poll.js",
"META-INF/adf/jsLibsDebug/ColorField.js",
"META-INF/adf/jsLibsDebug/ColorFieldFormat.js",
- "META-INF/adf/jsLibsDebug/ColorFormat.js",
+ //"META-INF/adf/jsLibsDebug/ColorFormat.js",
"META-INF/adf/jsLibsDebug/Shuttle.js",
"META-INF/adf/jsLibsDebug/PanelPopup.js",
"META-INF/adf/jsLibsDebug/PopupDialog.js",
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreFormatScriptsResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreFormatScriptsResourceLoader.java?rev=1102864&view=auto
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreFormatScriptsResourceLoader.java (added)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreFormatScriptsResourceLoader.java Fri May 13 18:57:05 2011
@@ -0,0 +1,57 @@
+package org.apache.myfaces.trinidadinternal.resource;
+
+import java.io.IOException;
+
+import java.net.URL;
+import java.net.URLConnection;
+
+import org.apache.myfaces.trinidad.resource.AggregatingResourceLoader;
+import org.apache.myfaces.trinidad.resource.ClassLoaderResourceLoader;
+
+public class CoreFormatScriptsResourceLoader extends AggregatingResourceLoader
+{
+ public CoreFormatScriptsResourceLoader(
+ boolean debug)
+ {
+ super("",
+ debug ? _DEBUG_LIBRARIES : _LIBRARIES,
+ new ClassLoaderResourceLoader());
+
+ setSeparator("\n");
+ }
+
+ /**
+ * Since CoreRenderKitResourceLoader already does the matching, this method is overridden
+ * to just call getURL()
+ */
+ @Override
+ protected URL findResource(String path) throws IOException
+ {
+ return getURL(path);
+ }
+
+ @Override
+ protected String getContentType(
+ URLConnection conn)
+ {
+ return "text/javascript";
+ }
+
+ static private final String[] _LIBRARIES =
+ {
+ "META-INF/adf/jsLibs/CharSets.js",
+ "META-INF/adf/jsLibs/TrCollections.js",
+ "META-INF/adf/jsLibs/NumberFormat.js",
+ "META-INF/adf/jsLibs/NumberConverter.js",
+ "META-INF/adf/jsLibs/CoreFormat.js"
+ };
+
+ static private final String[] _DEBUG_LIBRARIES =
+ {
+ "META-INF/adf/jsLibsDebug/CharSets.js",
+ "META-INF/adf/jsLibsDebug/TrCollections.js",
+ "META-INF/adf/jsLibsDebug/NumberFormat.js",
+ "META-INF/adf/jsLibsDebug/NumberConverter.js",
+ "META-INF/adf/jsLibsDebug/CoreFormat.js"
+ };
+}
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreRenderKitResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreRenderKitResourceLoader.java?rev=1102864&r1=1102863&r2=1102864&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreRenderKitResourceLoader.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreRenderKitResourceLoader.java Fri May 13 18:57:05 2011
@@ -1,4 +1,4 @@
-/*
+import org.apache.myfaces.trinidad.resource.RegexResourceLoader; /*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -47,27 +47,22 @@ public class CoreRenderKitResourceLoader
public CoreRenderKitResourceLoader(ResourceLoader parent)
{
register("(/.*/Common.*\\.js)",
- new CoreCommonScriptsResourceLoader(_getCommonLibraryURI(false),
- false));
+ new CoreCommonScriptsResourceLoader(false));
register("(/.*/DebugCommon.*\\.js)",
- new CoreCommonScriptsResourceLoader(_getCommonLibraryURI(true),
- true));
+ new CoreCommonScriptsResourceLoader(true));
+
+ register("(/.*/CoreFmt.*\\.js)",
+ new CoreFormatScriptsResourceLoader(false));
+ register("(/.*/DebugCoreFmt.*\\.js)",
+ new CoreFormatScriptsResourceLoader(true));
+
register("(/.*LocaleElements.*\\.js)",
- new LocaleElementsResourceLoader(getLocaleElementsURI("LocaleElements", true)));
+ new LocaleElementsResourceLoader());
register("(/.*\\.(css|cur|ico|jpg|gif|png|jpeg|svg|js))",
new CoreClassLoaderResourceLoader(parent));
}
- static private String _getCommonLibraryURI(boolean debug)
- {
- StringBuffer base = new StringBuffer(debug
- ? "/adf/jsLibs/DebugCommon"
- : "/adf/jsLibs/Common");
- return base.append(_VERSION)
- .append(".js")
- .toString();
- }
static public String getLocaleElementsURI(String str,
Boolean incVersion)
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/LocaleElementsResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/LocaleElementsResourceLoader.java?rev=1102864&r1=1102863&r2=1102864&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/LocaleElementsResourceLoader.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/LocaleElementsResourceLoader.java Fri May 13 18:57:05 2011
@@ -36,23 +36,26 @@ import org.apache.myfaces.trinidad.resou
*/
public class LocaleElementsResourceLoader extends AggregatingResourceLoader
{
- public LocaleElementsResourceLoader(
- String path)
+ public LocaleElementsResourceLoader()
{
- super(path,
+ super("",
_INIT_LIBRARIES,
new ClassLoaderResourceLoader());
setSeparator(_NEWLINE_SEPARATOR);
}
+ /**
+ * Since CoreRenderKitResourceLoader already does the matching, this method is overridden
+ * to just call getURL()
+ */
@Override
- protected URL findResource(
- String path) throws IOException
+ protected URL findResource(String path) throws IOException
{
return getURL(path);
}
+
/**
* Returns a URL which is an aggregate of all the paths.
*
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberConverter.js
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberConverter.js?rev=1102864&r1=1102863&r2=1102864&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberConverter.js (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberConverter.js Fri May 13 18:57:05 2011
@@ -219,7 +219,7 @@ TrNumberConverter.prototype.getAsObject
label
)
{
- numberString = TrUIUtils.trim(numberString);
+ numberString = TrFormatUtils.trim(numberString);
if(this._isConvertible(numberString))
{
@@ -333,7 +333,7 @@ TrNumberConverter.prototype._isConvertib
return false;
// check other common criteria as well.
- return TrUIUtils.isNumberConvertible(numberString);
+ return TrFormatUtils.isNumberConvertible(numberString);
}