Author: johnh
Date: Thu Feb 10 23:01:37 2011
New Revision: 1069607
URL: http://svn.apache.org/viewvc?rev=1069607&view=rev
Log:
Allows to export the symbols for compiled JavaScript code in the way
that fits each JsCompiler best. Included is a default implementation in
AbstractJsCompiler that should fit most compilers most of the time.
Patch provided by Jacobo Tarrio.
Added:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/AbstractJsCompiler.java
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/JsCompiler.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsHandler.java
Added:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/AbstractJsCompiler.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/AbstractJsCompiler.java?rev=1069607&view=auto
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/AbstractJsCompiler.java
(added)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/AbstractJsCompiler.java
Thu Feb 10 23:01:37 2011
@@ -0,0 +1,59 @@
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package org.apache.shindig.gadgets.rewrite.js;
+
+import com.google.caja.util.Sets;
+import com.google.common.collect.Lists;
+
+import org.apache.commons.lang.StringUtils;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Base for a JsCompiler implementation.
+ */
+public abstract class AbstractJsCompiler implements JsCompiler {
+
+ public String generateExportStatements(List<String> symbols) {
+ StringBuilder exportStatements = new StringBuilder();
+ Set<String> allExports = Sets.newHashSet();
+ List<String> exports = Lists.newArrayListWithCapacity(symbols.size());
+ exports.addAll(symbols);
+ Collections.sort(exports);
+ String prevExport = null;
+ for (String export : exports) {
+ if (!export.equals(prevExport)) {
+ String[] pieces = StringUtils.split(export, "\\.");
+ String base = "window";
+ for (int i = 0; i < pieces.length; ++i) {
+ String symExported = (i == 0) ? pieces[0] : base + "." + pieces[i];
+ if (!allExports.contains(symExported)) {
+ String curExport = base + "['" + pieces[i] + "']=" + symExported +
";\n";
+ exportStatements.append(curExport);
+ allExports.add(symExported);
+ }
+ base = symExported;
+ }
+ }
+ prevExport = export;
+ }
+ return exportStatements.toString();
+ }
+}
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/JsCompiler.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/JsCompiler.java?rev=1069607&r1=1069606&r2=1069607&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/JsCompiler.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/JsCompiler.java
Thu Feb 10 23:01:37 2011
@@ -20,8 +20,24 @@ package org.apache.shindig.gadgets.rewri
import java.util.List;
public interface JsCompiler {
+ /**
+ * Compiles the provided code with the provided list of external symbols.
+ *
+ * @param jsData The code to compile.
+ * @param externs The list of external symbols.
+ * @return A compilation result object.
+ */
public Result compile(String jsData, List<String> externs);
+ /**
+ * Generates a sequence of statements to mark the specified symbols as
+ * exported.
+ *
+ * @param symbols The symbols to export.
+ * @return A sequence of JavaScript statements to export those symbols.
+ */
+ public String generateExportStatements(List<String> symbols);
+
public static class Result {
private final String compiled;
private final List<String> errors;
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsHandler.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsHandler.java?rev=1069607&r1=1069606&r2=1069607&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsHandler.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsHandler.java
Thu Feb 10 23:01:37 2011
@@ -17,7 +17,6 @@
*/
package org.apache.shindig.gadgets.servlet;
-import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.JsonSerializer;
import org.apache.shindig.config.ContainerConfig;
import org.apache.shindig.gadgets.GadgetContext;
@@ -31,10 +30,8 @@ import org.apache.shindig.gadgets.rewrit
import org.apache.shindig.gadgets.uri.JsUriManager.JsUri;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import com.google.caja.util.Join;
import com.google.caja.util.Sets;
@@ -81,9 +78,8 @@ public class JsHandler {
/**
* Get the content of the feature resources and push it to jsData.
*
- * @param req The HttpServletRequest object.
- * @param ctx GadgetContext object.
- * @param needed Set of requested feature names.
+ * @param jsUri A JsUri object that describes the resources to get.
+ * @param host The name of the host the request was directed to.
* @return JsHandlerResponse object that contains JavaScript data and
cacheable flag.
*/
public Response getJsContent(final JsUri jsUri, String host) {
@@ -105,7 +101,6 @@ public class JsHandler {
boolean willCompile = willCompile(jsUri);
StringBuilder jsData = new StringBuilder();
List<String> allExterns = Lists.newArrayList();
- Set<String> allExports = Sets.newHashSet();
for (FeatureRegistry.FeatureBundle bundle : lookup.getBundles()) {
if (alreadyLoaded.contains(bundle.getName())) continue;
@@ -141,24 +136,7 @@ public class JsHandler {
// Add externs for this bundle.
appendExternsForBundle(bundle, allExterns);
- Collections.sort(rawExports);
- String prevExport = null;
- for (String export : rawExports) {
- if (!export.equals(prevExport)) {
- String[] pieces = StringUtils.split(export, "\\.");
- String base = "window";
- for (int i = 0; i < pieces.length; ++i) {
- String symExported = (i == 0) ? pieces[0] : base + "." +
pieces[i];
- if (!allExports.contains(symExported)) {
- String curExport = base + "['" + pieces[i] + "']=" +
symExported + ";\n";
- jsData.append(curExport);
- allExports.add(symExported);
- }
- base = symExported;
- }
- }
- prevExport = export;
- }
+ jsData.append(compiler.generateExportStatements(rawExports));
}
}
