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/28 16:40:35 UTC
svn commit: r928415 - in /myfaces/extensions/scripting/trunk: ./
extscript-core-root/extscript-core-java6/
extscript-core-root/extscript-core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/
extscript-core-root/extscript-core/ exts...
Author: werpu
Date: Sun Mar 28 14:40:34 2010
New Revision: 928415
URL: http://svn.apache.org/viewvc?rev=928415&view=rev
Log:
http://issues.apache.org/jira/browse/EXTSCRIPT-108
removing of dependencies and code cleanup
Added:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/RendererConst.java (with props)
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/StringUtils.java (contents, props changed)
- copied, changed from r927957, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/test/ListTest.java
Removed:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/ideas.txt
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/test/ListTest.java
Modified:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core-java6/pom.xml
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/ContainerFileManager.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/pom.xml
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/api/ClassScanner.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponent.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponentRenderer.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/TaintHistory.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/TaintHistoryRenderer.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/ClassLoaderUtils.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContextInitializer.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/refresh/FileChangedDaemon.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces12-extensions/pom.xml
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java
myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
myfaces/extensions/scripting/trunk/pom.xml
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core-java6/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core-java6/pom.xml?rev=928415&r1=928414&r2=928415&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core-java6/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core-java6/pom.xml Sun Mar 28 14:40:34 2010
@@ -16,22 +16,13 @@
<artifactId>extscript-core-root</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core-java6</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core-java6</developerConnection>
<url>http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core-java6</url>
</scm>
- <repositories>
- <repository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/2/</url>
- <layout>default</layout>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.myfaces.extension-scripting</groupId>
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/ContainerFileManager.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/ContainerFileManager.java?rev=928415&r1=928414&r2=928415&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/ContainerFileManager.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/ContainerFileManager.java Sun Mar 28 14:40:34 2010
@@ -18,10 +18,7 @@
*/
package org.apache.myfaces.scripting.loaders.java.jsr199;
-import org.apache.commons.lang.StringUtils;
-import org.apache.myfaces.scripting.api.ScriptingConst;
import org.apache.myfaces.scripting.core.util.ClassLoaderUtils;
-import org.apache.myfaces.scripting.core.util.ClassUtils;
import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.loaders.java.RecompiledClassLoader;
@@ -31,10 +28,6 @@ import javax.tools.JavaFileObject;
import javax.tools.StandardJavaFileManager;
import java.io.File;
import java.io.IOException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Collection;
-import java.util.Iterator;
/**
* @author Werner Punz (latest modification by $Author$)
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/pom.xml?rev=928415&r1=928414&r2=928415&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/pom.xml Sun Mar 28 14:40:34 2010
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>1.6.4</version>
+ <version>1.6.7</version>
</dependency>
<dependency>
@@ -70,7 +70,6 @@
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>3.2</version>
-
</dependency>
<dependency>
@@ -91,7 +90,6 @@
<artifactId>stax</artifactId>
<version>1.2.0</version>
</dependency>
-
</dependencies>
<build>
@@ -106,7 +104,6 @@
<configuration>
<source>1.5</source>
<target>1.5</target>
-
</configuration>
</plugin>
<plugin>
@@ -121,13 +118,12 @@
<goal>testCompile</goal>
</goals>
</execution>
-
- </executions>
+ </executions>
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>1.6.4</version>
+ <version>1.6.7</version>
</dependency>
</dependencies>
</plugin>
@@ -163,8 +159,7 @@
<shadedPattern>org.apache.myfaces.scripting.org.objectweb.asm</shadedPattern>
</relocation>
</relocations>
-
- </configuration>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/api/ClassScanner.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/api/ClassScanner.java?rev=928415&r1=928414&r2=928415&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/api/ClassScanner.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/api/ClassScanner.java Sun Mar 28 14:40:34 2010
@@ -41,6 +41,7 @@ public interface ClassScanner {
public void addScanPath(String scanPath);
+ @SuppressWarnings("unchecked")
public void scanClass(Class clazz);
public void scanAndMarkChange();
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponent.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponent.java?rev=928415&r1=928414&r2=928415&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponent.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponent.java Sun Mar 28 14:40:34 2010
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.scripting.components;
-import org.apache.commons.lang.StringUtils;
+import org.apache.myfaces.scripting.core.util.StringUtils;
import org.apache.myfaces.scripting.api.ScriptingConst;
import javax.el.ValueExpression;
@@ -38,10 +38,11 @@ public class CompilerComponent extends U
String _scriptingLanguage = null;
String _errorsLabel = null;
String _warningsLabel = null;
+ private static final String RENDERER_TYPE = "org.apache.myfaces.scripting.components.CompilerComponentRenderer";
public CompilerComponent() {
super();
- setRendererType("org.apache.myfaces.scripting.components.CompilerComponentRenderer");
+ setRendererType(RENDERER_TYPE);
}
@Override
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponentRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponentRenderer.java?rev=928415&r1=928414&r2=928415&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponentRenderer.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponentRenderer.java Sun Mar 28 14:40:34 2010
@@ -18,15 +18,15 @@
*/
package org.apache.myfaces.scripting.components;
-import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.scripting.api.CompilationResult;
import org.apache.myfaces.scripting.api.ScriptingConst;
+import org.apache.myfaces.scripting.core.util.StringUtils;
import org.apache.myfaces.scripting.core.util.WeavingContext;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlTextRendererBase;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
+import javax.faces.render.Renderer;
import java.io.IOException;
import java.util.logging.Logger;
@@ -36,7 +36,8 @@ import java.util.logging.Logger;
* This renderer is responsible for rendering the last compiler output
* hosted in our weavingContext
*/
-public class CompilerComponentRenderer extends HtmlTextRendererBase {
+public class CompilerComponentRenderer extends Renderer {
+
@Override
public void encodeBegin(FacesContext context, UIComponent component) throws IOException {
super.encodeBegin(context, component);
@@ -68,14 +69,14 @@ public class CompilerComponentRenderer e
break;
case ScriptingConst.ENGINE_TYPE_JSF_NO_ENGINE:
Logger log = Logger.getLogger(this.getClass().getName());
- log.warning("Warning engine not found");
+ log.warning(RendererConst.WARNING_ENGINE_NOT_FOUND);
break;
}
- startDiv(component, wrtr, "errorBox");
+ startDiv(component, wrtr, RendererConst.ERROR_BOX);
if (result == null || (!result.hasErrors() && result.getWarnings().isEmpty())) {
- wrtr.write("No compile errors");
+ wrtr.write(RendererConst.NO_COMPILE_ERRORS);
} else {
writeErrorsLabel(component, wrtr, compilerComp);
writeErrors(component, wrtr, result);
@@ -89,11 +90,11 @@ public class CompilerComponentRenderer e
}
private void writeWarnings(UIComponent component, ResponseWriter wrtr, CompilationResult result) throws IOException {
- startDiv(component, wrtr, "warnings");
+ startDiv(component, wrtr, RendererConst.WARNINGS);
for (CompilationResult.CompilationMessage msg : result.getWarnings()) {
- startDiv(component, wrtr, "line");
- writeDiv(component, wrtr, "lineNo", String.valueOf(msg.getLineNumber()));
- writeDiv(component, wrtr, "message", msg.getMessage());
+ startDiv(component, wrtr, RendererConst.LINE);
+ writeDiv(component, wrtr, RendererConst.LINE_NO, String.valueOf(msg.getLineNumber()));
+ writeDiv(component, wrtr, RendererConst.MESSAGE, msg.getMessage());
endDiv(wrtr);
}
endDiv(wrtr);
@@ -101,18 +102,18 @@ public class CompilerComponentRenderer e
private void writeWarningsLabel(UIComponent component, ResponseWriter wrtr, CompilerComponent compilerComp) throws IOException {
if (!StringUtils.isBlank(compilerComp.getWarningsLabel())) {
- startDiv(component, wrtr, "warningsLabel");
+ startDiv(component, wrtr, RendererConst.WARNINGS_LABEL);
wrtr.write(compilerComp.getWarningsLabel());
endDiv(wrtr);
}
}
private void writeErrors(UIComponent component, ResponseWriter wrtr, CompilationResult result) throws IOException {
- startDiv(component, wrtr, "errors");
+ startDiv(component, wrtr, RendererConst.ERRORS);
for (CompilationResult.CompilationMessage msg : result.getErrors()) {
- startDiv(component, wrtr, "line");
- writeDiv(component, wrtr, "lineNo", String.valueOf(msg.getLineNumber()));
- writeDiv(component, wrtr, "message", msg.getMessage());
+ startDiv(component, wrtr, RendererConst.LINE);
+ writeDiv(component, wrtr, RendererConst.LINE_NO, String.valueOf(msg.getLineNumber()));
+ writeDiv(component, wrtr, RendererConst.MESSAGE, msg.getMessage());
endDiv(wrtr);
}
endDiv(wrtr);
@@ -126,17 +127,17 @@ public class CompilerComponentRenderer e
}
private void endDiv(ResponseWriter wrtr) throws IOException {
- wrtr.endElement("div");
+ wrtr.endElement(RendererConst.HTML_DIV);
}
private void startDiv(UIComponent component, ResponseWriter wrtr, String styleClass) throws IOException {
- wrtr.startElement("div", component);
- wrtr.writeAttribute("class", styleClass, null);
+ wrtr.startElement(RendererConst.HTML_DIV, component);
+ wrtr.writeAttribute(RendererConst.HTML_CLASS, styleClass, null);
}
private void writeErrorsLabel(UIComponent component, ResponseWriter wrtr, CompilerComponent compilerComp) throws IOException {
if (!StringUtils.isBlank(compilerComp.getErrorsLabel())) {
- startDiv(component, wrtr, "errorsLabel");
+ startDiv(component, wrtr, RendererConst.ERRORS_LABEL);
wrtr.write(compilerComp.getErrorsLabel());
endDiv(wrtr);
}
Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/RendererConst.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/RendererConst.java?rev=928415&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/RendererConst.java (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/RendererConst.java Sun Mar 28 14:40:34 2010
@@ -0,0 +1,45 @@
+/*
+ * 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.myfaces.scripting.components;
+
+/**
+ * Renderer Constant shared by both renderers
+ *
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+
+public class RendererConst {
+ static final String ERROR_BOX = "errorBox";
+ static final String WARNING_ENGINE_NOT_FOUND = "Warning engine not found";
+ static final String LINE_NO = "lineNo";
+ static final String MESSAGE = "message";
+ static final String NO_COMPILE_ERRORS = "No compile errors";
+ static final String HTML_DIV = "div";
+ static final String HTML_CLASS = "class";
+ static final String NO_TAINT_HISTORY_FOUND = "No taint history found";
+ static final String LINE = "line";
+ static final String TIMESTAMP = "timestamp";
+ static final String CHANGED_FILE = "changedFile";
+ static final String ERRORS_LABEL = "errorsLabel";
+ static final String WARNINGS_LABEL = "warningsLabel";
+ static final String ERRORS = "errors";
+ static final String WARNINGS = "warnings";
+}
Propchange: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/RendererConst.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/RendererConst.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/TaintHistory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/TaintHistory.java?rev=928415&r1=928414&r2=928415&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/TaintHistory.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/TaintHistory.java Sun Mar 28 14:40:34 2010
@@ -36,9 +36,10 @@ public class TaintHistory extends UIOutp
Integer _noEntries;
String _filter;
+ private static final String RENDERER_TYPE = "org.apache.myfaces.scripting.components.TaintHistoryRenderer";
public TaintHistory() {
- setRendererType("org.apache.myfaces.scripting.components.TaintHistoryRenderer");
+ setRendererType(RENDERER_TYPE);
}
public void setNoEntries(Integer entries) {
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/TaintHistoryRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/TaintHistoryRenderer.java?rev=928415&r1=928414&r2=928415&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/TaintHistoryRenderer.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/components/TaintHistoryRenderer.java Sun Mar 28 14:40:34 2010
@@ -19,15 +19,15 @@
package org.apache.myfaces.scripting.components;
-import org.apache.commons.lang.StringUtils;
+import org.apache.myfaces.scripting.core.util.StringUtils;
import org.apache.myfaces.scripting.api.CompilationResult;
import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.refresh.ReloadingMetadata;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlTextRendererBase;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
+import javax.faces.render.Renderer;
import java.io.IOException;
import java.text.DateFormat;
import java.util.Collection;
@@ -40,10 +40,9 @@ import java.util.logging.Logger;
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public class TaintHistoryRenderer extends HtmlTextRendererBase {
+public class TaintHistoryRenderer extends Renderer {
static Logger _log = Logger.getLogger(TaintHistoryRenderer.class.getName());
-
@Override
public void encodeBegin(FacesContext context, UIComponent component) throws IOException {
super.encodeBegin(context, component);
@@ -55,7 +54,7 @@ public class TaintHistoryRenderer extend
Collection<ReloadingMetadata> result = WeavingContext.getRefreshContext().getLastTainted(lastTainted);
if (result == null || result.isEmpty()) {
- wrtr.write("No taint history found");
+ wrtr.write(RendererConst.NO_TAINT_HISTORY_FOUND);
} else {
writeHistory(component, wrtr, result);
}
@@ -68,9 +67,9 @@ public class TaintHistoryRenderer extend
private void writeHistory(UIComponent component, ResponseWriter wrtr, Collection<ReloadingMetadata> result) throws IOException {
startDiv(component, wrtr, "history");
for (ReloadingMetadata entry : result) {
- startDiv(component, wrtr, "line");
- writeDiv(component, wrtr, "timestamp", DateFormat.getInstance().format(new Date(entry.getTimestamp())));
- writeDiv(component, wrtr, "changedFile", entry.getFileName());
+ startDiv(component, wrtr, RendererConst.LINE);
+ writeDiv(component, wrtr, RendererConst.TIMESTAMP, DateFormat.getInstance().format(new Date(entry.getTimestamp())));
+ writeDiv(component, wrtr, RendererConst.CHANGED_FILE, entry.getFileName());
endDiv(wrtr);
}
@@ -85,17 +84,17 @@ public class TaintHistoryRenderer extend
}
private void endDiv(ResponseWriter wrtr) throws IOException {
- wrtr.endElement("div");
+ wrtr.endElement(RendererConst.HTML_DIV);
}
private void startDiv(UIComponent component, ResponseWriter wrtr, String styleClass) throws IOException {
- wrtr.startElement("div", component);
- wrtr.writeAttribute("class", styleClass, null);
+ wrtr.startElement(RendererConst.HTML_DIV, component);
+ wrtr.writeAttribute(RendererConst.HTML_CLASS, styleClass, null);
}
private void writeErrorsLabel(UIComponent component, ResponseWriter wrtr, CompilerComponent compilerComp) throws IOException {
if (!StringUtils.isBlank(compilerComp.getErrorsLabel())) {
- startDiv(component, wrtr, "errorsLabel");
+ startDiv(component, wrtr, RendererConst.ERRORS_LABEL);
wrtr.write(compilerComp.getErrorsLabel());
endDiv(wrtr);
}
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/ClassLoaderUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/ClassLoaderUtils.java?rev=928415&r1=928414&r2=928415&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/ClassLoaderUtils.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/ClassLoaderUtils.java Sun Mar 28 14:40:34 2010
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.scripting.core.util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.myfaces.scripting.core.util.StringUtils;
import java.io.File;
import java.net.MalformedURLException;
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/StringUtils.java (from r927957, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/test/ListTest.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/StringUtils.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/StringUtils.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/test/ListTest.java&r1=927957&r2=928415&rev=928415&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/test/ListTest.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/StringUtils.java Sun Mar 28 14:40:34 2010
@@ -16,30 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package test;
-import java.util.List;
-import java.util.LinkedList;
+package org.apache.myfaces.scripting.core.util;
/**
+ * Replacement for commons lang
+ * because we want to get the dependency out
+ * after all we only used StringUtils
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public class ListTest {
-
- public static void main(String... arg) {
-
- List<String> testList = new LinkedList<String>();
- testList.add("one");
- testList.add("two");
- testList.add("three");
-
- List testlist2 = testList.subList(0, 1);
- testList.remove(0);
- System.out.println(testList.size());
-
- System.out.println(testlist2.size());
-
+public class StringUtils {
+ public static boolean isBlank(String in) {
+ return in == null || in.trim().equals("");
}
}
Propchange: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/StringUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/StringUtils.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContextInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContextInitializer.java?rev=928415&r1=928414&r2=928415&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContextInitializer.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContextInitializer.java Sun Mar 28 14:40:34 2010
@@ -19,7 +19,7 @@
package org.apache.myfaces.scripting.core.util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.myfaces.scripting.core.util.StringUtils;
import org.apache.myfaces.scripting.api.Configuration;
import org.apache.myfaces.scripting.api.ScriptingConst;
import org.apache.myfaces.scripting.api.ScriptingWeaver;
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/refresh/FileChangedDaemon.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/refresh/FileChangedDaemon.java?rev=928415&r1=928414&r2=928415&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/refresh/FileChangedDaemon.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/refresh/FileChangedDaemon.java Sun Mar 28 14:40:34 2010
@@ -137,8 +137,6 @@ public class FileChangedDaemon extends T
if (weaver == null) return;
weaver.scanForAddedClasses();
- //TODO move this code also into the weaver so that
- //we have it centralized
for (Map.Entry<String, ReloadingMetadata> it : this.classMap.entrySet()) {
//if (!it.getValue().isTainted()) {
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java?rev=928415&r1=928414&r2=928415&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java Sun Mar 28 14:40:34 2010
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.scripting.servlet;
-import org.apache.commons.lang.StringUtils;
+import org.apache.myfaces.scripting.core.util.StringUtils;
import org.apache.myfaces.scripting.api.ScriptingConst;
import org.apache.myfaces.scripting.api.ScriptingWeaver;
import org.apache.myfaces.scripting.core.CoreWeaver;
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces12-extensions/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces12-extensions/pom.xml?rev=928415&r1=928414&r2=928415&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces12-extensions/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces12-extensions/pom.xml Sun Mar 28 14:40:34 2010
@@ -48,7 +48,7 @@
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
<version>1.1.11</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -56,12 +56,7 @@
<version>1.8.0</version>
</dependency>
- <dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>1.0</version>
- <scope>compile</scope>
- </dependency>
+
</dependencies>
<profiles>
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java?rev=928415&r1=928414&r2=928415&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java Sun Mar 28 14:40:34 2010
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.scripting.jsf2.annotation;
-import org.apache.commons.lang.StringUtils;
+import org.apache.myfaces.scripting.core.util.StringUtils;
import org.apache.myfaces.config.RuntimeConfig;
import org.apache.myfaces.config.element.NavigationRule;
import org.apache.myfaces.config.impl.digester.elements.ManagedBean;
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml?rev=928415&r1=928414&r2=928415&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml Sun Mar 28 14:40:34 2010
@@ -31,7 +31,7 @@
<param-value>org.apache.myfaces.scripting.servlet.StartupServletContextPluginChainLoader</param-value>
</context-param>
- <!--
+
<context-param>
<description>Additional comma separated loader paths to allow direct editing on the sources directory instead
of the deployment dir
@@ -68,7 +68,7 @@
<param-name>facelets.RESOURCE_RESOLVER</param-name>
<param-value>org.apache.myfaces.scripting.facelet.ReroutingResourceResolver</param-value>
</context-param>
- -->
+
<!--
<context-param>
<description>a comma separated whitelist of root packages which are compiled those and nothing else
Modified: myfaces/extensions/scripting/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/pom.xml?rev=928415&r1=928414&r2=928415&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/pom.xml Sun Mar 28 14:40:34 2010
@@ -40,7 +40,6 @@
<url>http://download.java.net/maven/2/</url>
<layout>default</layout>
</repository>
-
<repository>
<releases>
<enabled>false</enabled>
@@ -81,25 +80,11 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
- <scope>compile</scope>
- </dependency>
-
-
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
<scope>provided</scope>
</dependency>
@@ -141,8 +126,6 @@
<target>1.5</target>
</configuration>
</plugin>
-
-
</plugins>
@@ -181,6 +164,10 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jxr-maven-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+
</plugin>
<plugin>
@@ -195,6 +182,10 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>surefire-report-maven-plugin</artifactId>
+ <configuration>
+ <parallel>classes</parallel>
+ <threadCount>4</threadCount>
+ </configuration>
</plugin>
<plugin>
@@ -237,6 +228,55 @@
</plugins>
</build>
</profile>
+
+
+ <profile>
+ <id>eclipse</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+
+ <compilerId>eclipse</compilerId>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler-eclipse</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>jikes</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+
+ <compilerId>jikes</compilerId>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler-jikes</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
+
</project>