You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2012/02/19 16:43:14 UTC
git commit: DELTASPIKE-93 updated java-se example
Updated Branches:
refs/heads/master c33a3f66d -> 8d68af68f
DELTASPIKE-93 updated java-se example
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/8d68af68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/8d68af68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/8d68af68
Branch: refs/heads/master
Commit: 8d68af68f86a02ba5c021db0798260a3bc0d8671
Parents: c33a3f6
Author: gpetracek <gp...@apache.org>
Authored: Sun Feb 19 16:40:36 2012 +0100
Committer: gpetracek <gp...@apache.org>
Committed: Sun Feb 19 16:40:36 2012 +0100
----------------------------------------------------------------------
.../containerctrl/api/ContainerControl.java | 7 +-
.../owb/OpenWebBeansContainerControl.java | 4 +-
deltaspike/examples/jse-owb-examples/pom.xml | 23 +++++++-
.../apache/deltaspike/example/CdiContainer.java | 47 ---------------
.../beanmanagement/SimpleBeanLookupExample.java | 31 +++++++---
.../deltaspike/example/echo/EchoService.java | 1 +
.../NamingConventionAwareMetadataFilter.java | 8 +-
deltaspike/parent/pom.xml | 29 +++++++++
8 files changed, 82 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8d68af68/deltaspike/containerctrl/api/src/main/java/org/apache/deltaspike/containerctrl/api/ContainerControl.java
----------------------------------------------------------------------
diff --git a/deltaspike/containerctrl/api/src/main/java/org/apache/deltaspike/containerctrl/api/ContainerControl.java b/deltaspike/containerctrl/api/src/main/java/org/apache/deltaspike/containerctrl/api/ContainerControl.java
index e9566a6..d5a36b1 100644
--- a/deltaspike/containerctrl/api/src/main/java/org/apache/deltaspike/containerctrl/api/ContainerControl.java
+++ b/deltaspike/containerctrl/api/src/main/java/org/apache/deltaspike/containerctrl/api/ContainerControl.java
@@ -38,15 +38,14 @@ public interface ContainerControl
/**
* Booting the CdiTestContainer will scan the whole classpath
* for Beans and extensions available.
- * @throws Exception the container might throw a DeploymentException or similar
- * on startup.
+ * The container might throw a DeploymentException or similar on startup.
*/
- void bootContainer() throws Exception;
+ void bootContainer();
/**
* This will shutdown the underlying CDI container.
*/
- void shutdownContainer() throws Exception;
+ void shutdownContainer();
/**
* This will start all container built-in Contexts
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8d68af68/deltaspike/containerctrl/impl-owb/src/main/java/org/apache/deltaspike/cditest/containerctrl/owb/OpenWebBeansContainerControl.java
----------------------------------------------------------------------
diff --git a/deltaspike/containerctrl/impl-owb/src/main/java/org/apache/deltaspike/cditest/containerctrl/owb/OpenWebBeansContainerControl.java b/deltaspike/containerctrl/impl-owb/src/main/java/org/apache/deltaspike/cditest/containerctrl/owb/OpenWebBeansContainerControl.java
index 647e27e..101264c 100644
--- a/deltaspike/containerctrl/impl-owb/src/main/java/org/apache/deltaspike/cditest/containerctrl/owb/OpenWebBeansContainerControl.java
+++ b/deltaspike/containerctrl/impl-owb/src/main/java/org/apache/deltaspike/cditest/containerctrl/owb/OpenWebBeansContainerControl.java
@@ -48,7 +48,7 @@ public class OpenWebBeansContainerControl implements ContainerControl
private MockServletContext servletContext = null;
private MockHttpSession session = null;
- public void bootContainer() throws Exception
+ public void bootContainer()
{
servletContext = new MockServletContext();
session = new MockHttpSession();
@@ -56,7 +56,7 @@ public class OpenWebBeansContainerControl implements ContainerControl
lifecycle.startApplication(servletContext);
}
- public void shutdownContainer() throws Exception
+ public void shutdownContainer()
{
if (lifecycle != null)
{
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8d68af68/deltaspike/examples/jse-owb-examples/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/jse-owb-examples/pom.xml b/deltaspike/examples/jse-owb-examples/pom.xml
index 3548d50..6477f6d 100644
--- a/deltaspike/examples/jse-owb-examples/pom.xml
+++ b/deltaspike/examples/jse-owb-examples/pom.xml
@@ -81,14 +81,33 @@
<dependency>
<groupId>org.apache.deltaspike.modules</groupId>
<artifactId>deltaspike-security-module-api</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.deltaspike.modules</groupId>
<artifactId>deltaspike-security-module-impl</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- Dependencies for Java-SE -->
+ <dependency>
+ <groupId>org.apache.deltaspike.containerctrl</groupId>
+ <artifactId>deltaspike-containerctrl-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- TODO Add profiles -->
+ <dependency>
+ <groupId>org.apache.deltaspike.containerctrl</groupId>
+ <artifactId>deltaspike-containerctrl-owb</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- TODO refactoring - this dependency shouldn't be needed -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8d68af68/deltaspike/examples/jse-owb-examples/src/main/java/org/apache/deltaspike/example/CdiContainer.java
----------------------------------------------------------------------
diff --git a/deltaspike/examples/jse-owb-examples/src/main/java/org/apache/deltaspike/example/CdiContainer.java b/deltaspike/examples/jse-owb-examples/src/main/java/org/apache/deltaspike/example/CdiContainer.java
deleted file mode 100644
index 7815a27..0000000
--- a/deltaspike/examples/jse-owb-examples/src/main/java/org/apache/deltaspike/example/CdiContainer.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.deltaspike.example;
-
-import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.spi.ContainerLifecycle;
-
-/**
- * Helper class to start and stop the OpenWebBeansContainer
- */
-public class CdiContainer
-{
- private static ContainerLifecycle lifecycle = null;
-
- /**
- * Bootstraps the CDI container
- */
- public static void start()
- {
- lifecycle = WebBeansContext.currentInstance().getService(ContainerLifecycle.class);
- lifecycle.startApplication(null);
- }
-
- /**
- * Shutdown of the CDI container
- */
- public static void stop()
- {
- lifecycle.stopApplication(null);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8d68af68/deltaspike/examples/jse-owb-examples/src/main/java/org/apache/deltaspike/example/beanmanagement/SimpleBeanLookupExample.java
----------------------------------------------------------------------
diff --git a/deltaspike/examples/jse-owb-examples/src/main/java/org/apache/deltaspike/example/beanmanagement/SimpleBeanLookupExample.java b/deltaspike/examples/jse-owb-examples/src/main/java/org/apache/deltaspike/example/beanmanagement/SimpleBeanLookupExample.java
index 42cee22..5786347 100644
--- a/deltaspike/examples/jse-owb-examples/src/main/java/org/apache/deltaspike/example/beanmanagement/SimpleBeanLookupExample.java
+++ b/deltaspike/examples/jse-owb-examples/src/main/java/org/apache/deltaspike/example/beanmanagement/SimpleBeanLookupExample.java
@@ -18,12 +18,14 @@
*/
package org.apache.deltaspike.example.beanmanagement;
+import org.apache.deltaspike.containerctrl.api.ContainerControl;
+import org.apache.deltaspike.containerctrl.api.ContainerControlLoader;
import org.apache.deltaspike.core.api.provider.BeanProvider;
-import org.apache.deltaspike.example.CdiContainer;
import org.apache.deltaspike.example.echo.DefaultEchoService;
import org.apache.deltaspike.example.echo.EchoService;
import org.apache.deltaspike.example.optional.OptionalService;
+import javax.enterprise.context.ApplicationScoped;
import java.util.List;
import java.util.logging.Logger;
@@ -34,17 +36,26 @@ public class SimpleBeanLookupExample
{
private static final Logger LOG = Logger.getLogger(SimpleBeanLookupExample.class.getName());
+ private SimpleBeanLookupExample()
+ {
+ }
+
/**
* Entry point
+ *
* @param args currently not used
*/
public static void main(String[] args)
{
- CdiContainer.start();
+
+ ContainerControl containerControl = ContainerControlLoader.getCdiContainer();
+ containerControl.bootContainer();
+ //containerControl.startContexts();
+ containerControl.startContext(ApplicationScoped.class);
List<EchoService> echoServiceList = BeanProvider.getContextualReferences(EchoService.class, false);
- for(EchoService echoService : echoServiceList)
+ for (EchoService echoService : echoServiceList)
{
LOG.info(echoService.echo("Hello CDI bean!"));
}
@@ -53,7 +64,7 @@ public class SimpleBeanLookupExample
echoServiceList = BeanProvider.getContextualReferences(EchoService.class, false, false);
- for(EchoService echoService : echoServiceList)
+ for (EchoService echoService : echoServiceList)
{
LOG.info(echoService.echo("Hello non dependent CDI scoped bean!"));
}
@@ -69,16 +80,18 @@ public class SimpleBeanLookupExample
LOG.info(defaultEchoService.echo("Hello CDI bean resolved by name!"));
OptionalService optionalService = BeanProvider.getContextualReference(OptionalService.class, true);
-
- if(optionalService == null)
+
+ if (optionalService == null)
{
LOG.info("No (optional) implementation found for " + OptionalService.class.getName());
}
- else
+ else
{
LOG.severe("Unexpected implementation found: " + optionalService.getClass().getName());
}
-
- CdiContainer.stop();
+
+ containerControl.stopContext(ApplicationScoped.class);
+ //containerControl.stopContexts();
+ containerControl.shutdownContainer();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8d68af68/deltaspike/examples/jse-owb-examples/src/main/java/org/apache/deltaspike/example/echo/EchoService.java
----------------------------------------------------------------------
diff --git a/deltaspike/examples/jse-owb-examples/src/main/java/org/apache/deltaspike/example/echo/EchoService.java b/deltaspike/examples/jse-owb-examples/src/main/java/org/apache/deltaspike/example/echo/EchoService.java
index 0a86ab9..7333e58 100644
--- a/deltaspike/examples/jse-owb-examples/src/main/java/org/apache/deltaspike/example/echo/EchoService.java
+++ b/deltaspike/examples/jse-owb-examples/src/main/java/org/apache/deltaspike/example/echo/EchoService.java
@@ -25,6 +25,7 @@ public interface EchoService
{
/**
* Returns the given text again - the format might change
+ *
* @param message given message
* @return message text
*/
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8d68af68/deltaspike/examples/jse-owb-examples/src/main/java/org/apache/deltaspike/example/metadata/NamingConventionAwareMetadataFilter.java
----------------------------------------------------------------------
diff --git a/deltaspike/examples/jse-owb-examples/src/main/java/org/apache/deltaspike/example/metadata/NamingConventionAwareMetadataFilter.java b/deltaspike/examples/jse-owb-examples/src/main/java/org/apache/deltaspike/example/metadata/NamingConventionAwareMetadataFilter.java
index 444d830..18cd501 100644
--- a/deltaspike/examples/jse-owb-examples/src/main/java/org/apache/deltaspike/example/metadata/NamingConventionAwareMetadataFilter.java
+++ b/deltaspike/examples/jse-owb-examples/src/main/java/org/apache/deltaspike/example/metadata/NamingConventionAwareMetadataFilter.java
@@ -36,18 +36,18 @@ public class NamingConventionAwareMetadataFilter implements Extension
Class<?> beanClass = processAnnotatedType.getAnnotatedType().getJavaClass();
Named namedAnnotation = beanClass.getAnnotation(Named.class);
- if(namedAnnotation != null &&
+ if (namedAnnotation != null &&
namedAnnotation.value().length() > 0 &&
Character.isUpperCase(namedAnnotation.value().charAt(0)))
{
AnnotatedTypeBuilder builder = new AnnotatedTypeBuilder();
builder.readFromType(beanClass);
-
+
String beanName = namedAnnotation.value();
String newBeanName = beanName.substring(0, 1).toLowerCase() + beanName.substring(1);
-
+
builder.removeFromClass(Named.class)
- .addToClass(new NamedLiteral(newBeanName));
+ .addToClass(new NamedLiteral(newBeanName));
processAnnotatedType.setAnnotatedType(builder.create());
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8d68af68/deltaspike/parent/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index 9c6b433..d8b32a2 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -316,6 +316,35 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.deltaspike.modules</groupId>
+ <artifactId>deltaspike-security-module-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- Dependencies for Java-SE -->
+ <dependency>
+ <groupId>org.apache.deltaspike.containerctrl</groupId>
+ <artifactId>deltaspike-containerctrl-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.deltaspike.containerctrl</groupId>
+ <artifactId>deltaspike-containerctrl-owb</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</dependencyManagement>