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/29 23:00:55 UTC
svn commit: r928899 - in /myfaces/extensions/scripting/trunk: ./
extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/
extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/
e...
Author: werpu
Date: Mon Mar 29 21:00:54 2010
New Revision: 928899
URL: http://svn.apache.org/viewvc?rev=928899&view=rev
Log:
http://issues.apache.org/jira/browse/EXTSCRIPT-109
Added:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/LoggingHandler.java (contents, props changed)
- copied, changed from r928792, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/TestcaseLoggingHandler.java
Removed:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/TestcaseLoggingHandler.java
Modified:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/FailedStartupTestcase.java
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/pom.xml
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/FailedStartupTestcase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/FailedStartupTestcase.java?rev=928899&r1=928898&r2=928899&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/FailedStartupTestcase.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/FailedStartupTestcase.java Mon Mar 29 21:00:54 2010
@@ -20,8 +20,8 @@
package org.apache.myfaces.scripting.core.lifecycle;
import org.apache.myfaces.scripting.api.ScriptingConst;
+import org.apache.myfaces.scripting.core.support.LoggingHandler;
import org.apache.myfaces.scripting.core.support.MockServletContext;
-import org.apache.myfaces.scripting.core.support.TestcaseLoggingHandler;
import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.core.util.WeavingContextInitializer;
import org.junit.Before;
@@ -44,16 +44,16 @@ import static org.junit.Assert.*;
public class FailedStartupTestCase {
ServletContext context;
- TestcaseLoggingHandler handler;
+ LoggingHandler handler;
Logger logger;
private static final String MSG_DISABLED = "Scripting must be disabled";
private static final String VALID_PATH = "../../src/test/resources/brokenwebapp";
- private static final String INVALID_PATH = "../../src/test/resources/brokenwebapp2";
+ private static final String INVALID_PATH = "../../src/test/resources/nonexisting";
@Before
public void init() {
logger = Logger.getLogger(WeavingContextInitializer.class.getName());
- handler = new TestcaseLoggingHandler();
+ handler = new LoggingHandler();
/*
* we suppress the original handlers because we do not
* want unwanted messages in our console
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/LoggingHandler.java (from r928792, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/TestcaseLoggingHandler.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/LoggingHandler.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/LoggingHandler.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/TestcaseLoggingHandler.java&r1=928792&r2=928899&rev=928899&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/TestcaseLoggingHandler.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/LoggingHandler.java Mon Mar 29 21:00:54 2010
@@ -29,7 +29,7 @@ import java.util.logging.LogRecord;
* @version $Revision$ $Date$
*/
-public class TestcaseLoggingHandler extends Handler {
+public class LoggingHandler extends Handler {
StringBuilder _output = new StringBuilder();
@Override
Propchange: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/LoggingHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/LoggingHandler.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
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=928899&r1=928898&r2=928899&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 Mon Mar 29 21:00:54 2010
@@ -18,12 +18,11 @@
*/
package org.apache.myfaces.scripting.jsf2.annotation;
-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;
import org.apache.myfaces.scripting.api.AnnotationScanListener;
-import org.apache.myfaces.scripting.core.util.WeavingContext;
+import org.apache.myfaces.scripting.core.util.StringUtils;
import javax.faces.bean.*;
import java.lang.reflect.Field;
@@ -41,12 +40,6 @@ import java.util.logging.Level;
public class BeanImplementationListener extends BaseAnnotationScanListener implements AnnotationScanListener {
- private static final String SCOPE_SESSION = "session";
- private static final String SCOPE_APPLICATION = "application";
- private static final String SCOPE_VIEW = "view";
- private static final String SCOPE_NONE = "none";
- private static final String SCOPE_CUSTOM = "custom";
-
public boolean supportsAnnotation(String annotation) {
return annotation.equals(javax.faces.bean.ManagedBean.class.getName());
}
@@ -56,7 +49,6 @@ public class BeanImplementationListener
}
public void register(Class clazz, java.lang.annotation.Annotation ann) {
- String annotationName = ann.getClass().getName();
RuntimeConfig config = getRuntimeConfig();
@@ -70,7 +62,7 @@ public class BeanImplementationListener
beanName = beanName.replaceAll("\"", "");
//we need to reregister for every bean due to possible managed prop
//and scope changes
- ManagedBean mbean = null;
+ ManagedBean mbean;
if (!hasToReregister(beanName, clazz)) {
mbean = (ManagedBean) _alreadyRegistered.get(beanName);
//return;
@@ -110,8 +102,8 @@ public class BeanImplementationListener
if (log.isLoggable(Level.FINEST)) {
log.log(Level.FINEST, " Scanning field '" + field.getName() + "'");
}
- javax.faces.bean.ManagedProperty property = (javax.faces.bean.ManagedProperty) field
- .getAnnotation(javax.faces.bean.ManagedProperty.class);
+ javax.faces.bean.ManagedProperty property = field
+ .getAnnotation(ManagedProperty.class);
if (property != null) {
if (log.isLoggable(Level.FINE)) {
log.log(Level.FINE, " Field '" + field.getName()
@@ -128,8 +120,6 @@ public class BeanImplementationListener
mpc.setPropertyClass(field.getType().getName()); // FIXME - primitives, arrays, etc.
mpc.setValue(property.value());
mbean.addProperty(mpc);
-
- continue;
}
}
}
@@ -140,6 +130,7 @@ public class BeanImplementationListener
* <code>java.lang.Object</code>.</p>
*
* @param clazz Class to be analyzed
+ * @return the array of fields
*/
private Field[] fields(Class clazz) {
@@ -151,7 +142,7 @@ public class BeanImplementationListener
}
}
} while ((clazz = clazz.getSuperclass()) != Object.class);
- return (Field[]) fields.values().toArray(new Field[fields.size()]);
+ return fields.values().toArray(new Field[fields.size()]);
}
protected boolean hasToReregister(String name, Class clazz) {
@@ -209,6 +200,5 @@ public class BeanImplementationListener
_alreadyRegistered.remove(toRemove);
}
}
-
}
}
Modified: myfaces/extensions/scripting/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/pom.xml?rev=928899&r1=928898&r2=928899&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/pom.xml Mon Mar 29 21:00:54 2010
@@ -155,6 +155,29 @@
<target>1.5</target>
</configuration>
</plugin>
+
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <configuration>
+ <instrumentation>
+
+ <excludes>
+ <exclude>**/*Test.class</exclude>
+ </excludes>
+ </instrumentation>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+
</plugins>
@@ -226,6 +249,11 @@
</configuration>
</plugin>
+ <!-- cobertura code coverage plugin -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
</plugins>
</reporting>