You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2013/11/08 15:56:43 UTC
[1/4] git commit: Workaround for WELD-1546: try to lookup beanmanager
from JNDI first
Updated Branches:
refs/heads/master 8e6a6ec59 -> ad06b208b
Workaround for WELD-1546: try to lookup beanmanager from JNDI first
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/490f5dee
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/490f5dee
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/490f5dee
Branch: refs/heads/master
Commit: 490f5dee7606f8de78d34aff02694f1d6e091baf
Parents: 8e6a6ec
Author: Emond Papegaaij <em...@topicus.nl>
Authored: Fri Nov 8 11:55:16 2013 +0100
Committer: Emond Papegaaij <em...@topicus.nl>
Committed: Fri Nov 8 15:56:10 2013 +0100
----------------------------------------------------------------------
.../apache/wicket/cdi/BeanManagerLookup.java | 24 ++++++++++++++++++++
.../org/apache/wicket/cdi/CdiConfiguration.java | 2 +-
.../org/apache/wicket/cdi/NonContextual.java | 14 ++++++------
3 files changed, 32 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/490f5dee/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java
new file mode 100644
index 0000000..cbe8013
--- /dev/null
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java
@@ -0,0 +1,24 @@
+package org.apache.wicket.cdi;
+
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.CDI;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+public final class BeanManagerLookup
+{
+ private BeanManagerLookup()
+ {
+ }
+
+ public static BeanManager lookup() {
+ try
+ {
+ return InitialContext.doLookup("java:comp/BeanManager");
+ }
+ catch (NamingException e)
+ {
+ return CDI.current().getBeanManager();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/490f5dee/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
index a7175f0..a6d7509 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
@@ -281,7 +281,7 @@ public class CdiConfiguration
public static CdiConfiguration get()
{
- BeanManager beanManager = CDI.current().getBeanManager();
+ BeanManager beanManager = BeanManagerLookup.lookup();
Iterator<Bean<?>> iter = beanManager.getBeans(CdiConfiguration.class).iterator();
if (!iter.hasNext())
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/490f5dee/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/NonContextual.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/NonContextual.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/NonContextual.java
index e030d32..4e53d1d 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/NonContextual.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/NonContextual.java
@@ -49,14 +49,14 @@ public class NonContextual <T>
*/
public static void undeploy()
{
- if (cache.containsKey(CDI.current().getBeanManager()))
+ if (cache.containsKey(BeanManagerLookup.lookup()))
{
synchronized (lock)
{
// copy-on-write the cache
Map<BeanManager, ClassMetaCache<NonContextual<?>>> newCache = new WeakHashMap<BeanManager, ClassMetaCache<NonContextual<?>>>(
cache);
- newCache.remove(CDI.current().getBeanManager());
+ newCache.remove(BeanManagerLookup.lookup());
cache = Collections.unmodifiableMap(newCache);
}
}
@@ -87,12 +87,12 @@ public class NonContextual <T>
private static ClassMetaCache<NonContextual<?>> getCache()
{
- ClassMetaCache<NonContextual<?>> meta = cache.get(CDI.current().getBeanManager());
+ ClassMetaCache<NonContextual<?>> meta = cache.get(BeanManagerLookup.lookup());
if (meta == null)
{
synchronized (lock)
{
- BeanManager manager = CDI.current().getBeanManager();
+ BeanManager manager = BeanManagerLookup.lookup();
meta = cache.get(manager);
if (meta == null)
{
@@ -112,7 +112,7 @@ public class NonContextual <T>
@SuppressWarnings("unchecked")
private NonContextual(Class<? extends T> clazz)
{
- BeanManager manager = CDI.current().getBeanManager();
+ BeanManager manager = BeanManagerLookup.lookup();
AnnotatedType<? extends T> type = manager.createAnnotatedType(clazz);
this.it = (InjectionTarget<T>)manager.createInjectionTarget(type);
}
@@ -124,7 +124,7 @@ public class NonContextual <T>
*/
public void postConstruct(T instance)
{
- CreationalContext<T> cc = CDI.current().getBeanManager().createCreationalContext(null);
+ CreationalContext<T> cc = BeanManagerLookup.lookup().createCreationalContext(null);
it.inject(instance, cc);
it.postConstruct(instance);
}
@@ -136,7 +136,7 @@ public class NonContextual <T>
*/
public void inject(T instance)
{
- CreationalContext<T> cc = CDI.current().getBeanManager().createCreationalContext(null);
+ CreationalContext<T> cc = BeanManagerLookup.lookup().createCreationalContext(null);
it.inject(instance, cc);
}
[4/4] git commit: fix all kinds of warnings
Posted by pa...@apache.org.
fix all kinds of warnings
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ad06b208
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ad06b208
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ad06b208
Branch: refs/heads/master
Commit: ad06b208b6938cc5c051f54a0a0513cd98d3ce33
Parents: ad5d35c
Author: Emond Papegaaij <em...@topicus.nl>
Authored: Fri Nov 8 14:40:07 2013 +0100
Committer: Emond Papegaaij <em...@topicus.nl>
Committed: Fri Nov 8 15:56:27 2013 +0100
----------------------------------------------------------------------
.../main/java/org/apache/wicket/cdi/AbstractInjector.java | 2 +-
.../main/java/org/apache/wicket/cdi/CdiConfiguration.java | 2 +-
.../main/java/org/apache/wicket/cdi/ComponentInjector.java | 5 +----
.../org/apache/wicket/cdi/ConversationExpiredException.java | 2 ++
.../java/org/apache/wicket/cdi/ConversationIdMetaKey.java | 2 ++
.../java/org/apache/wicket/cdi/ConversationPropagator.java | 1 +
.../main/java/org/apache/wicket/cdi/DetachEventEmitter.java | 1 +
.../src/main/java/org/apache/wicket/cdi/NonContextual.java | 3 ++-
.../java/org/apache/wicket/cdi/ComponentInjectorTest.java | 8 ++++++--
.../org/apache/wicket/cdi/testapp/TestConversationBean.java | 3 ++-
.../org/apache/wicket/cdi/testapp/TestConversationPage.html | 2 +-
.../org/apache/wicket/cdi/testapp/TestConversationPage.java | 7 ++++++-
.../test/java/org/apache/wicket/cdi/testapp/TestPage.html | 2 +-
.../test/java/org/apache/wicket/cdi/testapp/TestPage.java | 3 ++-
14 files changed, 29 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad06b208/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/AbstractInjector.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/AbstractInjector.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/AbstractInjector.java
index bca2fb8..a9a528b 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/AbstractInjector.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/AbstractInjector.java
@@ -56,7 +56,7 @@ class AbstractInjector <T>
}
- private boolean ignore(Class instanceClass)
+ private boolean ignore(Class<?> instanceClass)
{
String packageName = instanceClass.getPackage().getName();
for(String ignore:ignorePackages.get())
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad06b208/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
index a6d7509..82e4b0f 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
@@ -28,7 +28,6 @@ import javax.enterprise.inject.Instance;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.CDI;
import javax.inject.Inject;
import org.apache.wicket.Application;
@@ -279,6 +278,7 @@ public class CdiConfiguration
}
+ @SuppressWarnings("unchecked")
public static CdiConfiguration get()
{
BeanManager beanManager = BeanManagerLookup.lookup();
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad06b208/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ComponentInjector.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ComponentInjector.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ComponentInjector.java
index 3b284b9..ab620bb 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ComponentInjector.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ComponentInjector.java
@@ -16,13 +16,10 @@
*/
package org.apache.wicket.cdi;
-import java.lang.reflect.Modifier;
import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+
import org.apache.wicket.Component;
import org.apache.wicket.application.IComponentInstantiationListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Injects components with CDI dependencies
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad06b208/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationExpiredException.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationExpiredException.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationExpiredException.java
index d8324e3..ab62ff0 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationExpiredException.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationExpiredException.java
@@ -21,6 +21,8 @@ import org.apache.wicket.request.IRequestHandler;
public class ConversationExpiredException extends RuntimeException
{
+ private static final long serialVersionUID = 1L;
+
private final String cid;
private final Page page;
private final IRequestHandler handler;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad06b208/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationIdMetaKey.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationIdMetaKey.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationIdMetaKey.java
index 94874c8..f05aa3b 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationIdMetaKey.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationIdMetaKey.java
@@ -20,5 +20,7 @@ import org.apache.wicket.MetaDataKey;
final class ConversationIdMetaKey extends MetaDataKey<String>
{
+ private static final long serialVersionUID = 1L;
+
static final ConversationIdMetaKey INSTANCE = new ConversationIdMetaKey();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad06b208/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java
index 9ee7ec8..94991b4 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java
@@ -64,6 +64,7 @@ public class ConversationPropagator extends AbstractRequestCycleListener impleme
private static final MetaDataKey<Boolean> CONVERSATION_STARTED_KEY = new MetaDataKey<Boolean>()
{
+ private static final long serialVersionUID = 1L;
};
static final String CID_ATTR = "cid";
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad06b208/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/DetachEventEmitter.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/DetachEventEmitter.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/DetachEventEmitter.java
index 6e6a957..09aa73c 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/DetachEventEmitter.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/DetachEventEmitter.java
@@ -41,6 +41,7 @@ public class DetachEventEmitter extends AbstractRequestCycleListener implements
private static final MetaDataKey<Boolean> DETACH_SCHEDULED_KEY = new MetaDataKey<Boolean>()
{
+ private static final long serialVersionUID = 1L;
};
@Inject
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad06b208/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/NonContextual.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/NonContextual.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/NonContextual.java
index 4e53d1d..1112f4f 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/NonContextual.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/NonContextual.java
@@ -20,10 +20,11 @@ import java.util.Collections;
import java.util.Map;
import java.util.WeakHashMap;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.CDI;
import javax.enterprise.inject.spi.InjectionTarget;
import org.apache.wicket.util.collections.ClassMetaCache;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad06b208/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ComponentInjectorTest.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ComponentInjectorTest.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ComponentInjectorTest.java
index 8cef530..360ff33 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ComponentInjectorTest.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ComponentInjectorTest.java
@@ -57,6 +57,8 @@ public class ComponentInjectorTest extends WicketCdiTestCase
WebComponent component = new WebComponent("someId")
{
+ private static final long serialVersionUID = 1L;
+
@Inject
@TestQualifier
private String dependency;
@@ -72,7 +74,8 @@ public class ComponentInjectorTest extends WicketCdiTestCase
private class TestNonStaticComponent extends WebComponent
{
-
+ private static final long serialVersionUID = 1L;
+
@Inject
@TestQualifier
private String dependency;
@@ -85,7 +88,8 @@ public class ComponentInjectorTest extends WicketCdiTestCase
private static class TestStaticComponent extends WebComponent
{
-
+ private static final long serialVersionUID = 1L;
+
@Inject
@TestQualifier
private String dependency;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad06b208/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationBean.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationBean.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationBean.java
index 92bf9bf..3253370 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationBean.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationBean.java
@@ -27,7 +27,8 @@ import javax.enterprise.context.ConversationScoped;
@ConversationScoped
public class TestConversationBean implements Serializable
{
-
+ private static final long serialVersionUID = 1L;
+
private AtomicInteger counter = new AtomicInteger();
public int getCount()
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad06b208/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.html
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.html b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.html
index 06d96a2..b6753b3 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.html
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html>
+<html xmlns:wicket>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad06b208/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.java
index 9d9ccad..8357ed7 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.java
@@ -29,6 +29,7 @@ import org.apache.wicket.model.PropertyModel;
*/
public class TestConversationPage extends WebPage
{
+ private static final long serialVersionUID = 1L;
@Inject
Conversation conversation;
@@ -41,10 +42,12 @@ public class TestConversationPage extends WebPage
conversation.begin();
- add(new Label("count", new PropertyModel(this, "counter.count")));
+ add(new Label("count", new PropertyModel<Integer>(this, "counter.count")));
add(new Link<Void>("increment")
{
+ private static final long serialVersionUID = 1L;
+
@Override
public void onClick()
{
@@ -53,6 +56,8 @@ public class TestConversationPage extends WebPage
});
add(new Link<Void>("reset")
{
+ private static final long serialVersionUID = 1L;
+
@Override
public void onClick()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad06b208/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestPage.html
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestPage.html b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestPage.html
index 0439c9e..4689c49 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestPage.html
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestPage.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html>
+<html xmlns:wicket>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad06b208/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestPage.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestPage.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestPage.java
index 742400a..704bf09 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestPage.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/testapp/TestPage.java
@@ -26,7 +26,8 @@ import org.apache.wicket.markup.html.basic.Label;
*/
public class TestPage extends WebPage
{
-
+ private static final long serialVersionUID = 1L;
+
@Inject
TestAppScope appScope;
[2/4] git commit: Also inject anonymous classes
Posted by pa...@apache.org.
Also inject anonymous classes
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f3f0c61b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f3f0c61b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f3f0c61b
Branch: refs/heads/master
Commit: f3f0c61b354ce4ed6ae36ee79329e16bef7bfc6f
Parents: 490f5de
Author: Emond Papegaaij <em...@topicus.nl>
Authored: Fri Nov 8 14:22:16 2013 +0100
Committer: Emond Papegaaij <em...@topicus.nl>
Committed: Fri Nov 8 15:56:18 2013 +0100
----------------------------------------------------------------------
.../main/java/org/apache/wicket/cdi/AbstractInjector.java | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f3f0c61b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/AbstractInjector.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/AbstractInjector.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/AbstractInjector.java
index 139606e..bca2fb8 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/AbstractInjector.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/AbstractInjector.java
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.cdi;
-import java.lang.reflect.Modifier;
import javax.enterprise.inject.Instance;
import javax.inject.Inject;
import org.slf4j.Logger;
@@ -59,13 +58,6 @@ class AbstractInjector <T>
private boolean ignore(Class instanceClass)
{
- if (instanceClass.isAnonymousClass() ||
- (instanceClass.isMemberClass() && Modifier.isStatic(instanceClass.getModifiers()) == false))
- {
- LOG.debug("Skipping non-static inner class '{}' ", instanceClass);
- return true;
- }
-
String packageName = instanceClass.getPackage().getName();
for(String ignore:ignorePackages.get())
{
[3/4] git commit: Fix testcases
Posted by pa...@apache.org.
Fix testcases
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ad5d35c3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ad5d35c3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ad5d35c3
Branch: refs/heads/master
Commit: ad5d35c3b62dfefb06a7f617b35d28ff8d745755
Parents: f3f0c61
Author: Emond Papegaaij <em...@topicus.nl>
Authored: Fri Nov 8 14:35:22 2013 +0100
Committer: Emond Papegaaij <em...@topicus.nl>
Committed: Fri Nov 8 15:56:23 2013 +0100
----------------------------------------------------------------------
.../wicket-cdi-1.1/wicket-cdi-1.1-core/pom.xml | 2 +-
.../org/apache/wicket/cdi/BeanManagerLookup.java | 16 ++++++++++++++++
.../apache/wicket/cdi/ComponentInjectorTest.java | 10 ++++------
.../org/apache/wicket/cdi/WicketCdiTestCase.java | 3 +--
4 files changed, 22 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad5d35c3/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/pom.xml b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/pom.xml
index dd2106e..d488750 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/pom.xml
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.jglue.cdi-unit</groupId>
<artifactId>cdi-unit</artifactId>
- <version>2.1.0</version>
+ <version>2.2.1</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad5d35c3/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java
index cbe8013..d9051ba 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java
@@ -1,3 +1,19 @@
+/*
+ * 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.wicket.cdi;
import javax.enterprise.inject.spi.BeanManager;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad5d35c3/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ComponentInjectorTest.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ComponentInjectorTest.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ComponentInjectorTest.java
index e093ae2..8cef530 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ComponentInjectorTest.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ComponentInjectorTest.java
@@ -38,9 +38,7 @@ public class ComponentInjectorTest extends WicketCdiTestCase
public void innerNonStaticClass()
{
TestNonStaticComponent component = new TestNonStaticComponent("someId");
- assertNull(component.dependency);
- componentInjector.onInstantiation(component);
- assertNull(component.dependency);
+ assertEquals(component.dependency, "Test String");
}
/**
@@ -50,7 +48,6 @@ public class ComponentInjectorTest extends WicketCdiTestCase
public void innerStaticClass()
{
TestStaticComponent component = new TestStaticComponent("someId");
- componentInjector.onInstantiation(component);
assertEquals(component.dependency, "Test String");
}
@@ -61,6 +58,7 @@ public class ComponentInjectorTest extends WicketCdiTestCase
WebComponent component = new WebComponent("someId")
{
@Inject
+ @TestQualifier
private String dependency;
@Override
@@ -69,14 +67,14 @@ public class ComponentInjectorTest extends WicketCdiTestCase
return dependency;
}
};
- componentInjector.onInstantiation(component);
- assertNull(component.toString());
+ assertEquals(component.toString(), "Test String");
}
private class TestNonStaticComponent extends WebComponent
{
@Inject
+ @TestQualifier
private String dependency;
public TestNonStaticComponent(String id)
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad5d35c3/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
index 6d66c29..1f16a58 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
@@ -66,13 +66,12 @@ public class WicketCdiTestCase extends Assert
{
tester.destroy();
tester = null;
+ contextController.closeRequest();
}
private void prepareRequest(HttpServletRequest request)
{
contextController.openRequest(request);
- contextController.openSession(request);
- contextController.openConversation(request);
}
}