Author: dan.j.allen Date: 2009-05-29 14:31:01 -0400 (Fri, 29 May 2009) New Revision: 11045 Added: modules/trunk/pom.xml Removed: modules/trunk/parent/ Modified: modules/trunk/el/pom.xml modules/trunk/web/src/main/java/org/jboss/seam/web/SeamListener.java Log: move parent to top-level Modified: modules/trunk/el/pom.xml =================================================================== --- modules/trunk/el/pom.xml 2009-05-29 18:20:39 UTC (rev 11044) +++ modules/trunk/el/pom.xml 2009-05-29 18:31:01 UTC (rev 11045) @@ -8,7 +8,7 @@ <groupId>org.jboss.seam</groupId> <version>3.0.0-SNAPSHOT</version> <!-- could use this to build w/o having install the parent - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> --> </parent> Copied: modules/trunk/pom.xml (from rev 11026, modules/trunk/parent/pom.xml) =================================================================== --- modules/trunk/pom.xml (rev 0) +++ modules/trunk/pom.xml 2009-05-29 18:31:01 UTC (rev 11045) @@ -0,0 +1,318 @@ +<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.seam</groupId> + <artifactId>seam-version-matrix</artifactId> + <version>3.0.0-SNAPSHOT</version> + <relativePath>version-matrix/pom.xml</relativePath> + </parent> + + <artifactId>seam-parent</artifactId> + <packaging>pom</packaging> + <version>3.0.0-SNAPSHOT</version> + + <name>Seam, a next-generation Java EE framework</name> + + <description> + Seam is a powerful open source development platform for building rich + Internet applications in Java. Seam integrates technologies such as Java + Contexts and Dependency Injection (JCDI), Asynchronous JavaScript and XML + (Ajax), JavaServer Faces (JSF 2.0), Java Persistence (JPA 2.0), + Enterprise Java Beans (EJB 3.1) and Business Process Management (BPM) + into a unified full-stack solution, complete with sophisticated tooling + provided by JBoss Tools. + </description> + + <url>http://www.seamframework.org</url> + + <inceptionYear>2005</inceptionYear> + + <licenses> + <license> + <name>Lesser Gnu Public License, Version 2.1</name> + <url>http://www.gnu.org/licenses/lgpl-2.1.html</url> + </license> + </licenses> + + <developers> + <developer> + <name>Pete Muir</name> + <roles> + <role>Project Lead</role> + </roles> + <email&gt;pete.muir(a)jboss.org&lt;/email&gt; + <organization>JBoss, a division of Red Hat</organization> + <url>http://in.relation.to/Bloggers/Pete</url> + </developer> + + <developer> + <name>Gavin King</name> + <roles> + <role>Project Founder</role> + </roles> + <url>http://in.relation.to/Bloggers/Gavin</url> + <organization>JBoss, a division of Red Hat</organization> + </developer> + + <developer> + <name>Norman Richards</name> + <roles> + <role>Core Developer</role> + </roles> + <url>http://in.relation.to/Bloggers/Norman</url> + <organization>JBoss, a division of Red Hat</organization> + </developer> + + <developer> + <name>Shane Bryzak</name> + <roles> + <role>Core Developer</role> + </roles> + <url>http://in.relation.to/Bloggers/Shane</url> + <organization>JBoss, a division of Red Hat</organization> + </developer> + + <developer> + <name>Dan Allen</name> + <roles> + <role>Core Developer</role> + </roles> + <url>http://in.relation.to/Bloggers/Dan</url> + <organization>JBoss, a division of Red Hat</organization> + </developer> + + <!-- TODO continue adding core developers --> + + </developers> + + <modules> + <!-- declaring version-matrix (our parent) as a module forces it to be built first --> + <module>version-matrix</module> + <module>mock</module> + <module>bridge-api</module> + <module>webbeans-bridge</module> + <module>beans</module> + <module>resources</module> + <module>el</module> + <module>international</module> + <module>web</module> + <module>drools</module> + <module>security</module> + <module>faces</module> + </modules> + + <dependencies> + + <dependency> + <groupId>org.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-api</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <scope>test</scope> + <classifier>jdk15</classifier> + </dependency> + + <dependency> + <groupId>${webbeans.groupId}</groupId> + <artifactId>webbeans-core-test</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <defaultGoal>package</defaultGoal> + <pluginManagement> + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-eclipse-plugin</artifactId> + <configuration> + <classpathContainers> + <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5</classpathContainer> + </classpathContainers> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addDefaultImplementationEntries> + true + </addDefaultImplementationEntries> + <addDefaultSpecificationEntries> + true + </addDefaultSpecificationEntries> + </manifest> + </archive> + </configuration> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>emma-maven-plugin</artifactId> + <configuration> + <forkMode>once</forkMode> + <metadataFile>../target/coverage.em</metadataFile> + <outputDirectory>${project.build.directory}/generated-classes</outputDirectory> + </configuration> + </plugin> + + </plugins> + </pluginManagement> + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <phase>verify</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.0-beta-8</version> + <configuration> + <tagBase>https://svn.jboss.org/repos/webbeans/ri/tags</tagBase> + <autoVersionSubmodules>true</autoVersionSubmodules> + </configuration> + </plugin> + + </plugins> + </build> + + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <configuration> + <formats> + <format>html</format> + <format>xml</format> + </formats> + <instrumentation> + </instrumentation> + </configuration> + </plugin> + </plugins> + </reporting> + + <profiles> + + <profile> + <id>api-coverage</id> + <activation> + <property> + <name>apiCoverage</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <forkMode>once</forkMode> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>emma</groupId> + <artifactId>emma</artifactId> + <version>2.0.5312</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + + <profile> + <id>jdk5</id> + <activation> + <jdk>1.5</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + + </profiles> + + <ciManagement> + <system>Hudson</system> + <url /> + </ciManagement> + + <issueManagement> + <system>JIRA</system> + <url>http://jira.jboss.org/browse/JBSEAM</url> + </issueManagement> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/seam</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/seam</devel... + <url>http://fisheye.jboss.org/browse/Seam</url> + </scm> + + <distributionManagement> + <repository> + <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} --> + <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml --> + <!-- todo : replace this with direct svn access once the svnkit providers are available --> + <id>repository.jboss.org</id> + <url>file://${maven.repository.root}</url> + </repository> + <snapshotRepository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshot Repository</name> + <url>dav:https://snapshots.jboss.org/maven2</url> + </snapshotRepository> + </distributionManagement> + +</project> Modified: modules/trunk/web/src/main/java/org/jboss/seam/web/SeamListener.java =================================================================== --- modules/trunk/web/src/main/java/org/jboss/seam/web/SeamListener.java 2009-05-29 18:20:39 UTC (rev 11044) +++ modules/trunk/web/src/main/java/org/jboss/seam/web/SeamListener.java 2009-05-29 18:31:01 UTC (rev 11045) @@ -2,33 +2,15 @@ import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.spi.BeanManager; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletRequestEvent; import javax.servlet.http.HttpSessionEvent; +import javax.servlet.http.HttpSessionListener; import org.jboss.seam.beans.Created; import org.jboss.seam.beans.Destroyed; import org.jboss.seam.bridge.ManagerBridge; -import org.jboss.webbeans.servlet.api.ServletListener; -public class SeamListener implements ServletListener +public class SeamListener implements HttpSessionListener //, ServletContextListener, ServletRequestListener { - public void contextDestroyed(ServletContextEvent event) - { - } - - public void contextInitialized(ServletContextEvent event) - { - } - - public void requestDestroyed(ServletRequestEvent event) - { - } - - public void requestInitialized(ServletRequestEvent event) - { - } - public void sessionCreated(HttpSessionEvent event) { getBeanManager().fireEvent(event.getSession(), new AnnotationLiteral<Created>() {}); @@ -43,5 +25,4 @@ { return ManagerBridge.getProvider().getCurrentManager(); } - }