You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2011/02/23 11:11:22 UTC
svn commit: r1073672 - in /myfaces/extensions/cdi/trunk:
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/security/
core/impl/src/main/java/org/apache/myfaces/extension...
Author: gpetracek
Date: Wed Feb 23 10:11:21 2011
New Revision: 1073672
URL: http://svn.apache.org/viewvc?rev=1073672&view=rev
Log:
cleanup
Added:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/UnhandledException.java
Modified:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/security/AccessDecisionVoter.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/JndiUtils.java
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/security/ForcedViolationVoter.java
myfaces/extensions/cdi/trunk/jee-modules/bv-module/api/src/main/java/org/apache/myfaces/extensions/cdi/bv/api/ClassLevelValidator.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultPageBeanConfigEntry.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultRequestLifecycleCallbackEntry.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigEntry.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedInlineViewConfigDefinitionEntry.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/PageBeanConfigEntry.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/RequestLifecycleCallbackEntry.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/ViewConfigEntry.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluatorRegistry.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextManagerObserver.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/TestAccessDecisionVoter1.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/TestAccessDecisionVoter2.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/inline/pages/order/TestAccessDecisionVoter3.java
myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultScriptBuilder.java
myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultScriptExecutor.java
myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ScriptHelperMap.java
myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/SimplePageInteraction.java
Added: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/UnhandledException.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/UnhandledException.java?rev=1073672&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/UnhandledException.java (added)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/UnhandledException.java Wed Feb 23 10:11:21 2011
@@ -0,0 +1,37 @@
+/*
+ * 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.extensions.cdi.core.api;
+
+/**
+ * @author Gerhard Petracek
+ */
+public class UnhandledException extends RuntimeException
+{
+ private static final long serialVersionUID = -2218238182931072197L;
+
+ public UnhandledException(Throwable cause)
+ {
+ super(cause);
+ }
+
+ public UnhandledException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+}
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/security/AccessDecisionVoter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/security/AccessDecisionVoter.java?rev=1073672&r1=1073671&r2=1073672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/security/AccessDecisionVoter.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/security/AccessDecisionVoter.java Wed Feb 23 10:11:21 2011
@@ -20,7 +20,6 @@ package org.apache.myfaces.extensions.cd
import javax.interceptor.InvocationContext;
import java.util.Set;
-import java.io.Serializable;
/**
* Interface for implementing concrete voters.
@@ -30,7 +29,7 @@ import java.io.Serializable;
*
* @author Gerhard Petracek
*/
-public interface AccessDecisionVoter extends Serializable
+public interface AccessDecisionVoter
{
/**
* Checks the permission for the given {@link javax.interceptor.InvocationContext}.
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java?rev=1073672&r1=1073671&r2=1073672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java Wed Feb 23 10:11:21 2011
@@ -20,6 +20,7 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.Advanced;
import org.apache.myfaces.extensions.cdi.core.api.Aggregatable;
+import org.apache.myfaces.extensions.cdi.core.api.UnhandledException;
import org.apache.myfaces.extensions.cdi.core.api.config.CodiCoreConfig;
import org.apache.myfaces.extensions.cdi.core.api.projectstage.ProjectStage;
import org.apache.myfaces.extensions.cdi.core.api.provider.BeanManagerProvider;
@@ -373,7 +374,7 @@ public class CodiUtils
{
throw (RuntimeException)e;
}
- throw new RuntimeException("Exception in method call : " + method.getName(), e);
+ throw new UnhandledException("Exception in method call : " + method.getName(), e);
}
finally
{
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/JndiUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/JndiUtils.java?rev=1073672&r1=1073671&r2=1073672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/JndiUtils.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/JndiUtils.java Wed Feb 23 10:11:21 2011
@@ -18,6 +18,8 @@
*/
package org.apache.myfaces.extensions.cdi.core.impl.util;
+import org.apache.myfaces.extensions.cdi.core.api.UnhandledException;
+
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NameNotFoundException;
@@ -81,7 +83,7 @@ public final class JndiUtils
}
catch (NamingException e)
{
- throw new RuntimeException("Could not bind " + name + " to JNDI", e);
+ throw new UnhandledException("Could not bind " + name + " to JNDI", e);
}
}
@@ -94,7 +96,7 @@ public final class JndiUtils
}
catch (NamingException e)
{
- throw new RuntimeException("Could not unbind " + name + " from JNDI", e);
+ throw new UnhandledException("Could not unbind " + name + " from JNDI", e);
}
}
@@ -159,7 +161,7 @@ public final class JndiUtils
}
catch (NamingException e)
{
- throw new RuntimeException("Could not get " + name + " from JNDI", e);
+ throw new UnhandledException("Could not get " + name + " from JNDI", e);
}
}
Modified: myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/security/ForcedViolationVoter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/security/ForcedViolationVoter.java?rev=1073672&r1=1073671&r2=1073672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/security/ForcedViolationVoter.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/security/ForcedViolationVoter.java Wed Feb 23 10:11:21 2011
@@ -34,8 +34,6 @@ import java.util.Set;
@ApplicationScoped
public class ForcedViolationVoter extends AbstractAccessDecisionVoter
{
- private static final long serialVersionUID = -3321616879108078874L;
-
@Inject
@Jsf
private MessageContext messageContext;
Modified: myfaces/extensions/cdi/trunk/jee-modules/bv-module/api/src/main/java/org/apache/myfaces/extensions/cdi/bv/api/ClassLevelValidator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/bv-module/api/src/main/java/org/apache/myfaces/extensions/cdi/bv/api/ClassLevelValidator.java?rev=1073672&r1=1073671&r2=1073672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/api/src/main/java/org/apache/myfaces/extensions/cdi/bv/api/ClassLevelValidator.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/api/src/main/java/org/apache/myfaces/extensions/cdi/bv/api/ClassLevelValidator.java Wed Feb 23 10:11:21 2011
@@ -18,6 +18,8 @@
*/
package org.apache.myfaces.extensions.cdi.bv.api;
+import org.apache.myfaces.extensions.cdi.core.api.UnhandledException;
+
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.io.Serializable;
@@ -71,7 +73,7 @@ public abstract class ClassLevelValidato
{
throw (RuntimeException)e;
}
- throw new RuntimeException(e);
+ throw new UnhandledException(e);
}
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultPageBeanConfigEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultPageBeanConfigEntry.java?rev=1073672&r1=1073671&r2=1073672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultPageBeanConfigEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultPageBeanConfigEntry.java Wed Feb 23 10:11:21 2011
@@ -43,8 +43,6 @@ import static org.apache.myfaces.extensi
*/
class DefaultPageBeanConfigEntry implements PageBeanConfigEntry
{
- private static final long serialVersionUID = -6578882497923715372L;
-
private final String beanName;
private final Class beanClass;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultRequestLifecycleCallbackEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultRequestLifecycleCallbackEntry.java?rev=1073672&r1=1073671&r2=1073672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultRequestLifecycleCallbackEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultRequestLifecycleCallbackEntry.java Wed Feb 23 10:11:21 2011
@@ -29,8 +29,6 @@ import java.util.List;
*/
public class DefaultRequestLifecycleCallbackEntry implements RequestLifecycleCallbackEntry
{
- private static final long serialVersionUID = -5230233565028268416L;
-
private final List<Method> beforePhaseCallbacks;
private final List<Method> afterPhaseCallbacks;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigEntry.java?rev=1073672&r1=1073671&r2=1073672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigEntry.java Wed Feb 23 10:11:21 2011
@@ -45,8 +45,6 @@ import static org.apache.myfaces.extensi
*/
public class DefaultViewConfigEntry implements ViewConfigEntry
{
- private static final long serialVersionUID = 4707048794409336152L;
-
private final String viewId;
private final Class<? extends ViewConfig> viewDefinitionClass;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedInlineViewConfigDefinitionEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedInlineViewConfigDefinitionEntry.java?rev=1073672&r1=1073671&r2=1073672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedInlineViewConfigDefinitionEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedInlineViewConfigDefinitionEntry.java Wed Feb 23 10:11:21 2011
@@ -26,8 +26,6 @@ import org.apache.myfaces.extensions.cdi
*/
class ExtractedInlineViewConfigDefinitionEntry extends ExtractedViewConfigDefinitionEntry
{
- private static final long serialVersionUID = 4506644013820265055L;
-
public ExtractedInlineViewConfigDefinitionEntry(Class<? extends ViewConfig> viewDefinitionClass, String basePath)
{
super(viewDefinitionClass);
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java?rev=1073672&r1=1073671&r2=1073672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java Wed Feb 23 10:11:21 2011
@@ -37,8 +37,6 @@ import java.util.Collections;
*/
class ExtractedViewConfigDefinitionEntry implements ViewConfigEntry
{
- private static final long serialVersionUID = -8387356240329549455L;
-
final static String ROOT_PATH = "/";
final static String DEFAULT_EXTENSION = Page.Extension.XHTML;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/PageBeanConfigEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/PageBeanConfigEntry.java?rev=1073672&r1=1073671&r2=1073672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/PageBeanConfigEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/PageBeanConfigEntry.java Wed Feb 23 10:11:21 2011
@@ -21,12 +21,11 @@ package org.apache.myfaces.extensions.cd
import javax.faces.event.PhaseId;
import java.lang.reflect.Method;
import java.util.List;
-import java.io.Serializable;
/**
* @author Gerhard Petracek
*/
-public interface PageBeanConfigEntry extends Serializable
+public interface PageBeanConfigEntry
{
Class getBeanClass();
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/RequestLifecycleCallbackEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/RequestLifecycleCallbackEntry.java?rev=1073672&r1=1073671&r2=1073672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/RequestLifecycleCallbackEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/RequestLifecycleCallbackEntry.java Wed Feb 23 10:11:21 2011
@@ -20,12 +20,11 @@ package org.apache.myfaces.extensions.cd
import java.lang.reflect.Method;
import java.util.List;
-import java.io.Serializable;
/**
* @author Gerhard Petracek
*/
-public interface RequestLifecycleCallbackEntry extends Serializable
+public interface RequestLifecycleCallbackEntry
{
List<Method> getBeforePhaseCallbacks();
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/ViewConfigEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/ViewConfigEntry.java?rev=1073672&r1=1073671&r2=1073672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/ViewConfigEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/ViewConfigEntry.java Wed Feb 23 10:11:21 2011
@@ -22,14 +22,13 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.core.api.security.AccessDecisionVoter;
import org.apache.myfaces.extensions.cdi.jsf.api.config.view.Page;
-import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.util.List;
/**
* @author Gerhard Petracek
*/
-public interface ViewConfigEntry extends Serializable
+public interface ViewConfigEntry
{
String getViewId();
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluatorRegistry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluatorRegistry.java?rev=1073672&r1=1073671&r2=1073672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluatorRegistry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluatorRegistry.java Wed Feb 23 10:11:21 2011
@@ -26,7 +26,6 @@ import javax.annotation.PreDestroy;
import javax.faces.context.FacesContext;
import javax.inject.Inject;
import java.io.Serializable;
-import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
/**
@@ -40,13 +39,15 @@ public class ViewAccessConversationExpir
@Inject
private EditableWindowContext windowContext;
+ //CopyOnWriteArrayList due to Serializable warning in checkstyle rules
+ private CopyOnWriteArrayList<ViewAccessConversationExpirationEvaluator>
+ viewAccessConversationExpirationEvaluatorList
+ = new CopyOnWriteArrayList<ViewAccessConversationExpirationEvaluator>();
+
protected ViewAccessConversationExpirationEvaluatorRegistry()
{
}
- private List<ViewAccessConversationExpirationEvaluator> viewAccessConversationExpirationEvaluatorList
- = new CopyOnWriteArrayList<ViewAccessConversationExpirationEvaluator>();
-
void addViewAccessConversationExpirationEvaluator(ViewAccessConversationExpirationEvaluator evaluator)
{
this.viewAccessConversationExpirationEvaluatorList.add(evaluator);
@@ -85,9 +86,9 @@ public class ViewAccessConversationExpir
//here we are outside a request -> currently that's not supported -> TODO
return;
}
- List<ViewAccessConversationExpirationEvaluator> restoredList =
+ CopyOnWriteArrayList<ViewAccessConversationExpirationEvaluator> restoredList =
this.windowContext.getAttribute(ViewAccessConversationExpirationEvaluatorRegistry.class.getName(),
- List.class);
+ CopyOnWriteArrayList.class);
if(restoredList != null)
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextManagerObserver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextManagerObserver.java?rev=1073672&r1=1073671&r2=1073672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextManagerObserver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextManagerObserver.java Wed Feb 23 10:11:21 2011
@@ -19,6 +19,7 @@
package org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.config.WindowContextConfig;
+import org.apache.myfaces.extensions.cdi.core.api.UnhandledException;
import org.apache.myfaces.extensions.cdi.jsf.api.listener.phase.AfterPhase;
import org.apache.myfaces.extensions.cdi.jsf.api.listener.phase.JsfPhaseId;
import org.apache.myfaces.extensions.cdi.jsf.api.listener.phase.BeforePhase;
@@ -223,7 +224,7 @@ public class WindowContextManagerObserve
}
catch (IOException e)
{
- throw new RuntimeException(e);
+ throw new UnhandledException(e);
}
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/TestAccessDecisionVoter1.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/TestAccessDecisionVoter1.java?rev=1073672&r1=1073671&r2=1073672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/TestAccessDecisionVoter1.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/TestAccessDecisionVoter1.java Wed Feb 23 10:11:21 2011
@@ -29,8 +29,6 @@ import java.util.Set;
*/
class TestAccessDecisionVoter1 implements AccessDecisionVoter
{
- private static final long serialVersionUID = 4846398165384356791L;
-
public Set<SecurityViolation> checkPermission(InvocationContext invocationContext)
{
//do nothing
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/TestAccessDecisionVoter2.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/TestAccessDecisionVoter2.java?rev=1073672&r1=1073671&r2=1073672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/TestAccessDecisionVoter2.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/TestAccessDecisionVoter2.java Wed Feb 23 10:11:21 2011
@@ -29,8 +29,6 @@ import java.util.Set;
*/
class TestAccessDecisionVoter2 implements AccessDecisionVoter
{
- private static final long serialVersionUID = 181155776784988183L;
-
public Set<SecurityViolation> checkPermission(InvocationContext invocationContext)
{
//do nothing
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/inline/pages/order/TestAccessDecisionVoter3.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/inline/pages/order/TestAccessDecisionVoter3.java?rev=1073672&r1=1073671&r2=1073672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/inline/pages/order/TestAccessDecisionVoter3.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/inline/pages/order/TestAccessDecisionVoter3.java Wed Feb 23 10:11:21 2011
@@ -29,8 +29,6 @@ import java.util.Set;
*/
class TestAccessDecisionVoter3 implements AccessDecisionVoter
{
- private static final long serialVersionUID = -4768654044521911173L;
-
public Set<SecurityViolation> checkPermission(InvocationContext invocationContext)
{
//do nothing
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultScriptBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultScriptBuilder.java?rev=1073672&r1=1073671&r2=1073672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultScriptBuilder.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultScriptBuilder.java Wed Feb 23 10:11:21 2011
@@ -22,6 +22,7 @@ import org.apache.myfaces.extensions.cdi
import static org.apache.myfaces.extensions.cdi.scripting.impl.util.ExceptionUtils.overrideBuilderState;
import static org.apache.myfaces.extensions.cdi.scripting.impl.util.ScriptingUtils.resolveExternalExpressionInterpreter;
import org.apache.myfaces.extensions.cdi.scripting.impl.spi.ExternalExpressionInterpreter;
+import org.apache.myfaces.extensions.cdi.core.api.UnhandledException;
import javax.script.Bindings;
import javax.script.SimpleBindings;
@@ -105,7 +106,7 @@ class DefaultScriptBuilder implements Sc
}
catch (ScriptException e)
{
- throw new RuntimeException(e);
+ throw new UnhandledException(e);
}
}
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultScriptExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultScriptExecutor.java?rev=1073672&r1=1073671&r2=1073672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultScriptExecutor.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultScriptExecutor.java Wed Feb 23 10:11:21 2011
@@ -21,6 +21,7 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.scripting.api.ScriptExecutor;
import org.apache.myfaces.extensions.cdi.scripting.impl.spi.ExternalExpressionInterpreter;
import static org.apache.myfaces.extensions.cdi.scripting.impl.util.ScriptingUtils.resolveExternalExpressionInterpreter;
+import org.apache.myfaces.extensions.cdi.core.api.UnhandledException;
import javax.script.Bindings;
import javax.script.ScriptException;
@@ -64,7 +65,7 @@ public class DefaultScriptExecutor imple
}
catch (ScriptException e)
{
- throw new RuntimeException(e);
+ throw new UnhandledException(e);
}
}
@@ -82,7 +83,7 @@ public class DefaultScriptExecutor imple
}
catch (ScriptException e)
{
- throw new RuntimeException(e);
+ throw new UnhandledException(e);
}
}
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ScriptHelperMap.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ScriptHelperMap.java?rev=1073672&r1=1073671&r2=1073672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ScriptHelperMap.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ScriptHelperMap.java Wed Feb 23 10:11:21 2011
@@ -19,6 +19,7 @@
package org.apache.myfaces.extensions.cdi.scripting.impl.util;
import org.apache.myfaces.extensions.cdi.core.impl.util.UnmodifiableMap;
+import org.apache.myfaces.extensions.cdi.core.api.UnhandledException;
import static org.apache.myfaces.extensions.cdi.scripting.impl.util.ScriptingUtils.getCurrentScriptEngineManager;
import static org.apache.myfaces.extensions.cdi.scripting.impl.util.ScriptingUtils.resolveExternalExpressionInterpreter;
import org.apache.myfaces.extensions.cdi.scripting.impl.spi.ExternalExpressionInterpreter;
@@ -87,7 +88,7 @@ class ScriptHelperMap extends Unmodifiab
}
catch (ScriptException e)
{
- throw new RuntimeException(e);
+ throw new UnhandledException(e);
}
}
Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/SimplePageInteraction.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/SimplePageInteraction.java?rev=1073672&r1=1073671&r2=1073672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/SimplePageInteraction.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/SimplePageInteraction.java Wed Feb 23 10:11:21 2011
@@ -26,6 +26,7 @@ import com.gargoylesoftware.htmlunit.htm
import org.apache.http.conn.HttpHostConnectException;
import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig;
import org.apache.myfaces.extensions.cdi.core.api.util.ClassUtils;
+import org.apache.myfaces.extensions.cdi.core.api.UnhandledException;
import org.apache.myfaces.extensions.cdi.jsf.impl.config.view.ViewConfigCache;
import org.apache.myfaces.extensions.cdi.jsf.impl.config.view.ViewConfigExtension;
import org.apache.myfaces.extensions.cdi.test.junit4.AbstractJsfAwareTest;
@@ -256,7 +257,7 @@ public class SimplePageInteraction
}
else
{
- throw new RuntimeException(e);
+ throw new UnhandledException(e);
}
}
}
@@ -287,7 +288,7 @@ public class SimplePageInteraction
}
catch (IOException e)
{
- throw new RuntimeException(e);
+ throw new UnhandledException(e);
}
}