August 2008 - weld-commits - Jboss List Archives

[webbeans-commits] Webbeans SVN: r73 - in ri/trunk/examples/webbeans-pizzashack: src/main and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-08-08 07:22:43 -0400 (Fri, 08 Aug 2008) New Revision: 73 Added: ri/trunk/examples/webbeans-pizzashack/.classpath ri/trunk/examples/webbeans-pizzashack/.project ri/trunk/examples/webbeans-pizzashack/src/main/resources/ ri/trunk/examples/webbeans-pizzashack/src/main/webapp/ ri/trunk/examples/webbeans-pizzashack/target/ Removed: ri/trunk/examples/webbeans-pizzashack/resources/ ri/trunk/examples/webbeans-pizzashack/view/ Modified: ri/trunk/examples/webbeans-pizzashack/pom.xml Log: Make stuff follow maven conventions Added: ri/trunk/examples/webbeans-pizzashack/.classpath =================================================================== --- ri/trunk/examples/webbeans-pizzashack/.classpath (rev 0) +++ ri/trunk/examples/webbeans-pizzashack/.classpath 2008-08-08 11:22:43 UTC (rev 73) @@ -0,0 +1,6 @@ +<classpath> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> +</classpath> \ No newline at end of file Property changes on: ri/trunk/examples/webbeans-pizzashack/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/examples/webbeans-pizzashack/.project =================================================================== --- ri/trunk/examples/webbeans-pizzashack/.project (rev 0) +++ ri/trunk/examples/webbeans-pizzashack/.project 2008-08-08 11:22:43 UTC (rev 73) @@ -0,0 +1,13 @@ +<projectDescription> + <name>webbeans-pizzashack</name> + <comment>Examples for the reference implementation of JSR 299: Web Beans</comment> + <projects/> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file Property changes on: ri/trunk/examples/webbeans-pizzashack/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/examples/webbeans-pizzashack/pom.xml =================================================================== --- ri/trunk/examples/webbeans-pizzashack/pom.xml 2008-08-08 11:19:01 UTC (rev 72) +++ ri/trunk/examples/webbeans-pizzashack/pom.xml 2008-08-08 11:22:43 UTC (rev 73) @@ -3,14 +3,18 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.jboss.webbeans.examples</groupId> <artifactId>parent</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.jboss.webbeans.examples.pizzashack</groupId> <artifactId>webbeans-pizzashack</artifactId> <packaging>war</packaging> + <description>Web Beans Examples: Pizzashack</description> + <dependencies> <dependency> <groupId>junit</groupId> @@ -18,8 +22,10 @@ <scope>test</scope> </dependency> </dependencies> + <build> <finalName>webbeans-pizzashack</finalName> </build> + </project> Copied: ri/trunk/examples/webbeans-pizzashack/src/main/resources (from rev 71, ri/trunk/examples/webbeans-pizzashack/resources) Copied: ri/trunk/examples/webbeans-pizzashack/src/main/webapp (from rev 71, ri/trunk/examples/webbeans-pizzashack/view)

15 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r72 - ri/trunk/examples/webbeans-pizzashack.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-08-08 07:19:01 -0400 (Fri, 08 Aug 2008) New Revision: 72 Modified: ri/trunk/examples/webbeans-pizzashack/pom.xml Log: ws, xsd Modified: ri/trunk/examples/webbeans-pizzashack/pom.xml =================================================================== --- ri/trunk/examples/webbeans-pizzashack/pom.xml 2008-08-08 11:14:08 UTC (rev 71) +++ ri/trunk/examples/webbeans-pizzashack/pom.xml 2008-08-08 11:19:01 UTC (rev 72) @@ -1,22 +1,25 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.jboss.webbeans.examples</groupId> - <artifactId>parent</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> - <groupId>org.jboss.webbeans.examples.pizzashack</groupId> - <artifactId>webbeans-pizzashack</artifactId> - <packaging>war</packaging> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <finalName>webbeans-pizzashack</finalName> - </build> +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.webbeans.examples</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + <groupId>org.jboss.webbeans.examples.pizzashack</groupId> + <artifactId>webbeans-pizzashack</artifactId> + <packaging>war</packaging> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <finalName>webbeans-pizzashack</finalName> + </build> </project>

15 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r71 - in ri/trunk/examples: webbeans-pizzashack and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-08-08 07:14:08 -0400 (Fri, 08 Aug 2008) New Revision: 71 Added: ri/trunk/examples/webbeans-pizzashack/ ri/trunk/examples/webbeans-pizzashack/pom.xml ri/trunk/examples/webbeans-pizzashack/resources/ ri/trunk/examples/webbeans-pizzashack/src/ ri/trunk/examples/webbeans-pizzashack/view/ Removed: ri/trunk/examples/pizzashack/ ri/trunk/examples/webbeans-pizzashack/resources/ ri/trunk/examples/webbeans-pizzashack/src/ ri/trunk/examples/webbeans-pizzashack/view/ Log: move pizzashack Copied: ri/trunk/examples/webbeans-pizzashack (from rev 69, ri/trunk/examples/pizzashack) Copied: ri/trunk/examples/webbeans-pizzashack/pom.xml (from rev 70, ri/trunk/examples/pizzashack/pom.xml) =================================================================== --- ri/trunk/examples/webbeans-pizzashack/pom.xml (rev 0) +++ ri/trunk/examples/webbeans-pizzashack/pom.xml 2008-08-08 11:14:08 UTC (rev 71) @@ -0,0 +1,22 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.webbeans.examples</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + <groupId>org.jboss.webbeans.examples.pizzashack</groupId> + <artifactId>webbeans-pizzashack</artifactId> + <packaging>war</packaging> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <finalName>webbeans-pizzashack</finalName> + </build> +</project> + Copied: ri/trunk/examples/webbeans-pizzashack/resources (from rev 70, ri/trunk/examples/pizzashack/resources) Copied: ri/trunk/examples/webbeans-pizzashack/src (from rev 70, ri/trunk/examples/pizzashack/src) Copied: ri/trunk/examples/webbeans-pizzashack/view (from rev 70, ri/trunk/examples/pizzashack/view)

15 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r70 - in ri/trunk/examples: pizzashack and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-08-08 07:13:23 -0400 (Fri, 08 Aug 2008) New Revision: 70 Added: ri/trunk/examples/pizzashack/pom.xml ri/trunk/examples/pom.xml Log: add poms Added: ri/trunk/examples/pizzashack/pom.xml =================================================================== --- ri/trunk/examples/pizzashack/pom.xml (rev 0) +++ ri/trunk/examples/pizzashack/pom.xml 2008-08-08 11:13:23 UTC (rev 70) @@ -0,0 +1,22 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.webbeans.examples</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + <groupId>org.jboss.webbeans.examples.pizzashack</groupId> + <artifactId>webbeans-pizzashack</artifactId> + <packaging>war</packaging> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <finalName>webbeans-pizzashack</finalName> + </build> +</project> + Added: ri/trunk/examples/pom.xml =================================================================== --- ri/trunk/examples/pom.xml (rev 0) +++ ri/trunk/examples/pom.xml 2008-08-08 11:13:23 UTC (rev 70) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.webbeans</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + <groupId>org.jboss.webbeans.examples</groupId> + <artifactId>parent</artifactId> + <packaging>pom</packaging> + <name>Web Beans Examples</name> + + <description> + Examples for the reference implementation of JSR 299: Web Beans + </description> + + <modules> + <module>webbeans-pizzashack</module> + </modules> + +</project> +

15 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r69 - in ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans: init and 1 other directories.

by webbeans-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-08-05 21:20:03 -0400 (Tue, 05 Aug 2008) New Revision: 69 Added: ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/servlet/ServletRequestSessionMap.java ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/servlet/WebBeansFilter.java Modified: ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/ContainerImpl.java ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/init/Initialization.java ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java Log: initialization / context stuff Modified: ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/ContainerImpl.java =================================================================== --- ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/ContainerImpl.java 2008-08-06 01:07:01 UTC (rev 68) +++ ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/ContainerImpl.java 2008-08-06 01:20:03 UTC (rev 69) @@ -4,11 +4,13 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import javax.webbeans.ComponentInstance; import javax.webbeans.Container; import javax.webbeans.Context; +import javax.webbeans.ContextNotActive; import javax.webbeans.Observer; import javax.webbeans.Standard; import javax.webbeans.TypeLiteral; @@ -24,6 +26,9 @@ private StereotypeManager stereotypeManager; private EjbManager ejbLookupManager; + private ThreadLocal<Map<Class<Annotation>, Context>> contexts = + new ThreadLocal<Map<Class<Annotation>, Context>>(); + private Set<ComponentInstance> components; public ContainerImpl(List<Annotation> enabledDeploymentTypes) @@ -78,10 +83,17 @@ public Context getContext(Class<Annotation> scopeType) { - // TODO Auto-generated method stub - return null; + Context context = contexts.get().get(scopeType); - + if (context == null) + { + // If context can't be found throw an exception (section 9.4 of spec) + throw new ContextNotActive(); + } + else + { + return context; + } } public Object getInstanceByName(String name) Modified: ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/init/Initialization.java =================================================================== --- ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/init/Initialization.java 2008-08-06 01:07:01 UTC (rev 68) +++ ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/init/Initialization.java 2008-08-06 01:20:03 UTC (rev 69) @@ -14,12 +14,12 @@ */ public class Initialization { + public static final String WEBBEANS_CONTAINER_KEY = "javax.webbeans.Container"; + private ServletContext servletContext; DeploymentStrategy deploymentStrategy; - - private static Container container; - + public Initialization(ServletContext servletContext) { this.servletContext = servletContext; @@ -27,7 +27,10 @@ public Initialization create() { - container = new ContainerImpl(null); + Container container = new ContainerImpl(null); + + servletContext.setAttribute(WEBBEANS_CONTAINER_KEY, container); + deploymentStrategy = new DeploymentStrategy(Thread.currentThread().getContextClassLoader(), container); return this; } Added: ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/servlet/ServletRequestSessionMap.java =================================================================== --- ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/servlet/ServletRequestSessionMap.java (rev 0) +++ ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/servlet/ServletRequestSessionMap.java 2008-08-06 01:20:03 UTC (rev 69) @@ -0,0 +1,115 @@ +package org.jboss.webbeans.servlet; + +import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +/** + * + * @author Shane Bryzak + * + */ +public class ServletRequestSessionMap +{ + private HttpServletRequest request; + + public ServletRequestSessionMap(HttpServletRequest request) + { + this.request = request; + } + + public void clear() + { + throw new UnsupportedOperationException(); + } + + public boolean containsKey(Object key) + { + HttpSession session = request.getSession(false); + return session==null ? false : session.getAttribute( (String) key )!=null; + } + + public boolean containsValue(Object value) + { + throw new UnsupportedOperationException(); + } + + public Set<java.util.Map.Entry<String, Object>> entrySet() + { + throw new UnsupportedOperationException(); + } + + public Object get(Object key) + { + HttpSession session = request.getSession(false); + return session==null ? null : session.getAttribute( (String) key ); + } + + public boolean isEmpty() + { + throw new UnsupportedOperationException(); + } + + public Set<String> keySet() + { + HttpSession session = request.getSession(false); + if (session==null) + { + return Collections.EMPTY_SET; + } + else + { + Set<String> keys = new HashSet<String>(); + Enumeration<String> names = session.getAttributeNames(); + while ( names.hasMoreElements() ) + { + keys.add( names.nextElement() ); + } + return keys; + } + } + + public Object put(String key, Object value) + { + HttpSession session = request.getSession(true); + Object result = session.getAttribute(key); + session.setAttribute(key, value); + return result; + } + + public void putAll(Map<? extends String, ? extends Object> t) + { + throw new UnsupportedOperationException(); + } + + public Object remove(Object key) + { + HttpSession session = request.getSession(false); + if (session==null) + { + return null; + } + else + { + Object result = session.getAttribute( (String) key ); + session.removeAttribute( (String) key ); + return result; + } + } + + public int size() + { + throw new UnsupportedOperationException(); + } + + public Collection<Object> values() + { + throw new UnsupportedOperationException(); + } +} Added: ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/servlet/WebBeansFilter.java =================================================================== --- ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/servlet/WebBeansFilter.java (rev 0) +++ ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/servlet/WebBeansFilter.java 2008-08-06 01:20:03 UTC (rev 69) @@ -0,0 +1,54 @@ +package org.jboss.webbeans.servlet; + +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.webbeans.Container; +import javax.webbeans.Context; +import javax.webbeans.RequestScoped; + +import org.jboss.webbeans.BasicContext; +import org.jboss.webbeans.init.Initialization; + +/** + * + * @author Shane Bryzak + * + */ +public class WebBeansFilter implements Filter +{ + private Container container; + + public void init(FilterConfig filterConfig) throws ServletException + { + container = (Container) filterConfig.getServletContext().getAttribute( + Initialization.WEBBEANS_CONTAINER_KEY); + } + + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) + throws IOException, ServletException + { + BasicContext requestContext = new BasicContext(RequestScoped.class); + + try + { + container.addContext(requestContext); + + chain.doFilter(request, response); + } + finally + { + requestContext.destroy(container); + } + } + + public void destroy() + { + + } +} Modified: ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java =================================================================== --- ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java 2008-08-06 01:07:01 UTC (rev 68) +++ ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java 2008-08-06 01:20:03 UTC (rev 69) @@ -17,8 +17,8 @@ public void contextInitialized(ServletContextEvent event) { - ServletLifecycle.beginApplication( event.getServletContext() ); - new Initialization( event.getServletContext() ).create().init(); + ServletLifecycle.beginApplication( event.getServletContext() ); + new Initialization( event.getServletContext() ).create().init(); } public void sessionCreated(HttpSessionEvent event)

15 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r68 - in ri/trunk: examples and 6 other directories.

by webbeans-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-08-05 21:07:01 -0400 (Tue, 05 Aug 2008) New Revision: 68 Added: ri/trunk/examples/ ri/trunk/examples/pizzashack/ ri/trunk/examples/pizzashack/resources/ ri/trunk/examples/pizzashack/resources/META-INF/ ri/trunk/examples/pizzashack/resources/WEB-INF/ ri/trunk/examples/pizzashack/src/ ri/trunk/examples/pizzashack/src/main/ ri/trunk/examples/pizzashack/src/main/java/ ri/trunk/examples/pizzashack/view/ ri/trunk/examples/pizzashack/view/home.seam ri/trunk/examples/pizzashack/view/index.html ri/trunk/examples/pizzashack/view/style/ ri/trunk/examples/pizzashack/view/style/header.png ri/trunk/examples/pizzashack/view/style/main.css ri/trunk/examples/pizzashack/view/style/sidebar.png ri/trunk/examples/pizzashack/view/template.xhtml Log: webbeans example Added: ri/trunk/examples/pizzashack/view/home.seam =================================================================== --- ri/trunk/examples/pizzashack/view/home.seam (rev 0) +++ ri/trunk/examples/pizzashack/view/home.seam 2008-08-06 01:07:01 UTC (rev 68) @@ -0,0 +1,13 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib"> + + <ui:composition template="template.xhtml"> + <ui:define name="content"> + A Web Beans example + </ui:define> + </ui:composition> +</html> \ No newline at end of file Added: ri/trunk/examples/pizzashack/view/index.html =================================================================== --- ri/trunk/examples/pizzashack/view/index.html (rev 0) +++ ri/trunk/examples/pizzashack/view/index.html 2008-08-06 01:07:01 UTC (rev 68) @@ -0,0 +1,5 @@ +<html> +<head> + <meta http-equiv="Refresh" content="0; URL=home.seam"> +</head> +</html> \ No newline at end of file Added: ri/trunk/examples/pizzashack/view/style/header.png =================================================================== (Binary files differ) Property changes on: ri/trunk/examples/pizzashack/view/style/header.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: ri/trunk/examples/pizzashack/view/style/main.css =================================================================== --- ri/trunk/examples/pizzashack/view/style/main.css (rev 0) +++ ri/trunk/examples/pizzashack/view/style/main.css 2008-08-06 01:07:01 UTC (rev 68) @@ -0,0 +1,26 @@ +body { + margin: 0px; + background-color: #ffffff; +} + +#header { + background: url(header.png) top left no-repeat; + height: 116px; +} + +#container { + width: 1024px; + background-color: #ffffff; +} + +#sidebar { + background: url(sidebar.png) top left no-repeat; + background-color: #ffffff; + float: left; + width: 150px; + height: 487px; +} + +#content { + +} \ No newline at end of file Added: ri/trunk/examples/pizzashack/view/style/sidebar.png =================================================================== (Binary files differ) Property changes on: ri/trunk/examples/pizzashack/view/style/sidebar.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: ri/trunk/examples/pizzashack/view/template.xhtml =================================================================== --- ri/trunk/examples/pizzashack/view/template.xhtml (rev 0) +++ ri/trunk/examples/pizzashack/view/template.xhtml 2008-08-06 01:07:01 UTC (rev 68) @@ -0,0 +1,35 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> + +<head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> + <title>Pizza Shack</title> + <link href="style/main.css" rel="stylesheet" type="text/css"/> + <ui:insert name="head"/> +</head> + +<body> + + <div id="container"> + <div id="header"> + + </div> + + <div id="sidebar"> + + </div> + + <div id="content"> + <ui:insert name="content"/> + </div> + + <br style="clear:both"/> + </div> + +</body> +</html> +

15 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r67 - ri/trunk/webbeans-api/src/main/java/javax/webbeans.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-08-05 19:24:49 -0400 (Tue, 05 Aug 2008) New Revision: 67 Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Context.java Log: Fix Context interface Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Context.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Context.java 2008-08-05 23:08:49 UTC (rev 66) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Context.java 2008-08-05 23:24:49 UTC (rev 67) @@ -27,7 +27,7 @@ public interface Context { - public Class<Annotation> getScopeType(); + public Class<? extends Annotation> getScopeType(); public <T> T get(Container container, ComponentInstance<T> component, boolean create);

15 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r66 - ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-08-05 19:08:49 -0400 (Tue, 05 Aug 2008) New Revision: 66 Added: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/DeploymentStrategyTest.java ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/InitializationTest.java Modified: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/EnterpriseComponentModelTest.java Log: Deployment tests Added: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/DeploymentStrategyTest.java =================================================================== --- ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/DeploymentStrategyTest.java (rev 0) +++ ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/DeploymentStrategyTest.java 2008-08-05 23:08:49 UTC (rev 66) @@ -0,0 +1,24 @@ +package org.jboss.webbeans.test; + +import java.net.URL; + +import javax.webbeans.Container; + +import org.jboss.webbeans.ContainerImpl; +import org.jboss.webbeans.deployment.DeploymentStrategy; +import org.junit.Test; +import org.scannotation.ClasspathUrlFinder; + +public class DeploymentStrategyTest +{ + + @Test + public void testDeploymentStrategy() + { + URL[] urls = {ClasspathUrlFinder.findClassBase(DeploymentStrategyTest.class)}; + Container container = new ContainerImpl(null); + DeploymentStrategy deploymentStrategy = new DeploymentStrategy(Thread.currentThread().getContextClassLoader(), container); + deploymentStrategy.scan(urls); + } + +} Property changes on: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/DeploymentStrategyTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/EnterpriseComponentModelTest.java =================================================================== --- ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/EnterpriseComponentModelTest.java 2008-08-05 23:05:35 UTC (rev 65) +++ ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/EnterpriseComponentModelTest.java 2008-08-05 23:08:49 UTC (rev 66) @@ -25,7 +25,6 @@ import org.jboss.webbeans.util.ClassAnnotatedItem; import org.jboss.webbeans.util.MutableAnnotatedItem; import org.jboss.webbeans.util.Reflections; -import static org.jboss.webbeans.util.Reflections.annotationSetMatches; import org.junit.Before; import org.junit.Test; Added: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/InitializationTest.java =================================================================== --- ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/InitializationTest.java (rev 0) +++ ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/InitializationTest.java 2008-08-05 23:08:49 UTC (rev 66) @@ -0,0 +1,14 @@ +package org.jboss.webbeans.test; + +import org.junit.Test; + +public class InitializationTest +{ + + @Test + public void test() + { + + } + +} Property changes on: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/InitializationTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r65 - ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/model.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-08-05 19:05:35 -0400 (Tue, 05 Aug 2008) New Revision: 65 Modified: ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/model/StereotypeModel.java Log: Proper toString method Modified: ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/model/StereotypeModel.java =================================================================== --- ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/model/StereotypeModel.java 2008-08-05 23:05:22 UTC (rev 64) +++ ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/model/StereotypeModel.java 2008-08-05 23:05:35 UTC (rev 65) @@ -188,4 +188,11 @@ { return stereotypeClass; } + + @Override + public String toString() + { + return "[" + stereotypeClass + "]"; + } + }

15 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r64 - ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/deployment.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-08-05 19:05:22 -0400 (Tue, 05 Aug 2008) New Revision: 64 Modified: ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/deployment/DeploymentStrategy.java Log: method for unit tests Modified: ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/deployment/DeploymentStrategy.java =================================================================== --- ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/deployment/DeploymentStrategy.java 2008-08-05 23:04:16 UTC (rev 63) +++ ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/deployment/DeploymentStrategy.java 2008-08-05 23:05:22 UTC (rev 64) @@ -1,17 +1,22 @@ package org.jboss.webbeans.deployment; import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.logging.Logger; import javax.webbeans.Container; import javax.webbeans.DeploymentType; +import javax.webbeans.Stereotype; import org.jboss.webbeans.ComponentInstanceImpl; import org.jboss.webbeans.ContainerImpl; import org.jboss.webbeans.model.SimpleComponentModel; +import org.jboss.webbeans.model.StereotypeModel; import org.jboss.webbeans.util.ClassAnnotatedItem; import org.jboss.webbeans.util.LoggerUtil; import org.jboss.webbeans.util.MutableAnnotatedItem; @@ -26,7 +31,7 @@ */ public class DeploymentStrategy { - private static final Logger log = LoggerUtil.getLogger(DeploymentStrategy.class.getName()); + private static final Logger log = LoggerUtil.getLogger("deploymentStrategy"); private ClassLoader classLoader; private ContainerImpl container; @@ -43,9 +48,8 @@ this.container = (ContainerImpl) container; } - public void scan() + public void scan(URL[] urls) { - URL[] urls = ClasspathUrlFinder.findResourceBases("META-INF/web-beans.xml"); AnnotationDB db = new AnnotationDB(); try @@ -59,17 +63,47 @@ } Map<String,Set<String>> index = db.getAnnotationIndex(); + addStereotypes(index); + addComponents(index); + } + + private void addStereotypes(Map<String, Set<String>> index) + { + Set<String> stereotypeClassNames = index.get(Stereotype.class.getName()); + try + { + for (String className : stereotypeClassNames) + { + log.info("Creating stereotype " + className); + StereotypeModel stereotypeModel = new StereotypeModel(new ClassAnnotatedItem(Reflections.classForName(className))); + container.getStereotypeManager().addStereotype(stereotypeModel); + log.info("Stereotype: " + stereotypeModel); + } + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } + + private void addComponents(Map<String, Set<String>> index) + { + Set<String> annotationNames = index.get(DeploymentType.class.getName()); - Set<String> classNames = index.get(DeploymentType.class.getName()); - try { - for (String className : classNames) + for (String annotationType : annotationNames) { - SimpleComponentModel componentModel = new SimpleComponentModel( - new ClassAnnotatedItem(Reflections.classForName(className)), - new MutableAnnotatedItem(null, new HashMap()), container); - container.addComponent(new ComponentInstanceImpl(componentModel)); + Set<String> classNames = index.get(annotationType); + for (String className : classNames) + { + log.finest("Creating componnt" + className); + SimpleComponentModel componentModel = new SimpleComponentModel( + new ClassAnnotatedItem(Reflections.classForName(className)), + new MutableAnnotatedItem(null, new HashMap()), container); + container.addComponent(new ComponentInstanceImpl(componentModel)); + log.info("Web Bean: " + componentModel); + } } } catch (ClassNotFoundException ex) @@ -77,6 +111,14 @@ throw new RuntimeException(ex); } } + + public void scan() + { + URL[] urls = ClasspathUrlFinder.findResourceBases("META-INF/web-beans.xml"); + scan(urls); + } + + public ClassLoader getClassLoader() {

15 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits August 2008