Weld SVN: r5009 - in extensions/trunk/archetypes/weld-jsf-minimal/src: main and 13 other directories.
by weld-commits@lists.jboss.org
Author: sboscarine
Date: 2009-11-12 20:43:14 -0500 (Thu, 12 Nov 2009)
New Revision: 5009
Added:
extensions/trunk/archetypes/weld-jsf-minimal/src/main/
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/META-INF/
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/META-INF/archetype.xml
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/pom.xml
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/java/
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/resources/
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/resources/META-INF/
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/META-INF/
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/index.jsp
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/test/
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/test/java/
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/test/resources/
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/test/resources/jetty-env.xml
Log:
fixed commit errors. passed local test. Need to test from clean checkout.
Added: extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/META-INF/archetype.xml
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/META-INF/archetype.xml (rev 0)
+++ extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/META-INF/archetype.xml 2009-11-13 01:43:14 UTC (rev 5009)
@@ -0,0 +1,17 @@
+<archetype>
+ <id>weld-archetype-servlet-quickstart</id>
+ <resources>
+ <resource>src/main/webapp/index.xhtml</resource>
+ <resource>src/main/webapp/index.jsp</resource>
+ <resource>src/main/webapp/WEB-INF/web.xml</resource>
+ <resource>src/main/resources/META-INF/beans.xml</resource>
+ <resource>src/main/webapp/META-INF/context.xml</resource>
+ </resources>
+ <sources>
+ <source>src/main/java/HelloWorld.java</source>
+ </sources>
+ <testSources />
+ <testResources>
+ <resource>src/test/resources/jetty-env.xml</resource>
+ </testResources>
+</archetype>
\ No newline at end of file
Added: extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/pom.xml
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/pom.xml (rev 0)
+++ extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/pom.xml 2009-11-13 01:43:14 UTC (rev 5009)
@@ -0,0 +1,167 @@
+<?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>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}</artifactId>
+ <packaging>war</packaging>
+ <name>${artifactId}</name>
+ <version>${version}</version>
+ <properties>
+ <!--
+ eliminates [WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform
+ dependent!
+ -->
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+ <repositories>
+ <!--
+ As of October 2009, a few of the weld dependencies were not yet on the main maven repo. The JBoss repo is updated
+ more frequently.
+ -->
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <url>http://repository.jboss.org/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <dependencyManagement>
+ <dependencies>
+ <!-- Import scope will provide versions and scopes for dependency below. -->
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-extensions-bom</artifactId>
+ <version>1.0.0-CR2</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+ <!-- Common to JEE and Servlet containers -->
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+ <!-- JSF 2.0 -->
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+
+ <!-- Optional, but pretty useful. -->
+ <!-- <dependency>-->
+ <!-- <groupId>javax.servlet</groupId>-->
+ <!-- <artifactId>jstl</artifactId>-->
+ <!-- </dependency>-->
+
+ <!-- Optional, but highly recommended. -->
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.10</version>
+ <scope>test</scope>
+ <classifier>jdk15</classifier>
+ </dependency>
+
+
+ <!-- Jetty/Tomcat-specific scopes and artifacts -->
+
+ <!-- JSF 2.0 -->
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- end Jetty/Tomcat-specific scopes and artifacts -->
+
+ <!-- Sun Bean Validation API (JSR 303) -->
+ <!-- <dependency>-->
+ <!-- <groupId>javax.validation</groupId>-->
+ <!-- <artifactId>validation-api</artifactId>-->
+ <!-- <version>1.0.0.GA</version>-->
+ <!-- </dependency>-->
+ <!-- hibernate bean validation impl -->
+ <!-- <dependency>-->
+ <!-- <groupId>org.hibernate</groupId>-->
+ <!-- <artifactId>hibernate-validator</artifactId>-->
+ <!-- <version>4.0.0.GA</version>-->
+ <!-- </dependency>-->
+ <!-- For some reason, this is a dependency of Bean Validation -->
+ <!-- <dependency>-->
+ <!-- <groupId>org.slf4j</groupId>-->
+ <!-- <artifactId>slf4j-log4j12</artifactId>-->
+ <!-- <version>1.4.2</version>-->
+ <!-- </dependency>-->
+ </dependencies>
+ <build>
+ <finalName>${artifactId}</finalName>
+ <plugins>
+ <!-- Compiler plugin enforces Java 1.6 -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+
+ <!-- Eclipse plugin enforces download of source and JavaDoc jars -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <wtpversion>2.0</wtpversion>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>true</downloadJavadocs>
+ </configuration>
+ </plugin>
+ <!-- Embedded Jetty (jetty:run) -->
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+ <!-- Delete this block to have Jetty run default port (8080) -->
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>9090</port>
+ </connector>
+ </connectors>
+ <!-- force friendly name instead of artifact name + version -->
+ <contextPath>${build.finalName}</contextPath>
+ <!-- Where the BeanManager is constructed. This is where you'll declare datasources. -->
+ <jettyEnvXml>\${basedir}/src/test/resources/jetty-env.xml</jettyEnvXml>
+ <!-- This parameter will auto-deploy modified classes. -->
+ <!-- You can save changes in a file or class and refresh your browser to view the changes. -->
+ <scanIntervalSeconds>3</scanIntervalSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Added: extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/java/HelloWorld.java (rev 0)
+++ extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/java/HelloWorld.java 2009-11-13 01:43:14 UTC (rev 5009)
@@ -0,0 +1,24 @@
+package ${package};
+
+import java.io.Serializable;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
+@RequestScoped
+@Named
+public class HelloWorld implements Serializable
+{
+ public HelloWorld()
+ {
+ System.out.println(this.getClass().getSimpleName() + " was constructed");
+ }
+
+ private final String text = "Hello World!";
+
+ public String getText()
+ {
+ return text;
+ }
+
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
Added: extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml (rev 0)
+++ extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml 2009-11-13 01:43:14 UTC (rev 5009)
@@ -0,0 +1,7 @@
+<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+ <alternatives />
+ <decorators />
+ <interceptors />
+</beans>
\ No newline at end of file
Added: extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml (rev 0)
+++ extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml 2009-11-13 01:43:14 UTC (rev 5009)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Context>
+ <Manager pathname="" /> <!-- disables storage of sessions across restarts -->
+ <Resource name="BeanManager" auth="Container"
+ type="javax.enterprise.inject.spi.BeanManager" factory="org.jboss.weld.resources.ManagerObjectFactory" />
+ <!-- Uncomment to enable injection into Servlet -->
+ <!-- <Listener className="org.jboss.weld.environment.tomcat.WeldLifecycleListener"/> -->
+</Context>
Added: extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml (rev 0)
+++ extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml 2009-11-13 01:43:14 UTC (rev 5009)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!-- This file is optional. It can be deleted at any time. -->
+<faces-config version="2.0" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd">
+</faces-config>
\ No newline at end of file
Added: extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2009-11-13 01:43:14 UTC (rev 5009)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
+
+ <!-- Standard JSF 2.0 Configuration Paramters. -->
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <!-- Tell the context which URLs to process as facelets. -->
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+
+ <!-- This is an optional parameter, but it makes troubleshooting errors much easier. -->
+ <!-- You may want to delete it before final deployment -->
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
+ <!-- Weld Jetty/Tomcat specific configuration parameters -->
+ <!-- Both the listener and resource-env-ref tags can be deleted in JEE6 containers. -->
+ <listener>
+ <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class>
+ </listener>
+ <resource-env-ref>
+ <description>Object factory for the CDI Bean Manager</description>
+ <resource-env-ref-name>BeanManager</resource-env-ref-name>
+ <resource-env-ref-type>javax.enterprise.inject.spi.BeanManager</resource-env-ref-type>
+ </resource-env-ref>
+</web-app>
\ No newline at end of file
Added: extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/index.jsp
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/index.jsp (rev 0)
+++ extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/index.jsp 2009-11-13 01:43:14 UTC (rev 5009)
@@ -0,0 +1,5 @@
+<html>
+<head>
+<meta HTTP-EQUIV="REFRESH" content="0; url=index.jsf">
+</head>
+</html>
Added: extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml (rev 0)
+++ extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml 2009-11-13 01:43:14 UTC (rev 5009)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html">
+<h:head>
+ <title>JSF Demo</title>
+</h:head>
+<h:body>
+ <h1>Does Weld Work?</h1>
+ <p>My weld-injected bean says: #{helloWorld.text} in a JSF EL dialect.</p>
+ <p>You can write the same value using UEL ${helloWorld.text}</p>
+</h:body>
+</html>
\ No newline at end of file
Added: extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/test/resources/jetty-env.xml
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/test/resources/jetty-env.xml (rev 0)
+++ extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/test/resources/jetty-env.xml 2009-11-13 01:43:14 UTC (rev 5009)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+<Configure id="webAppCtx" class="org.mortbay.jetty.webapp.WebAppContext">
+ <New id="appManager" class="org.mortbay.jetty.plus.naming.Resource">
+ <Arg>
+ <Ref id="webAppCtx" />
+ </Arg>
+ <Arg>BeanManager</Arg>
+ <Arg>
+ <New class="javax.naming.Reference">
+ <Arg>javax.enterprise.inject.spi.BeanManager</Arg>
+ <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg>
+ <Arg />
+ </New>
+ </Arg>
+ </New>
+</Configure>
14 years, 10 months
Weld SVN: r5008 - extensions/trunk/archetypes/weld-jsf-minimal.
by weld-commits@lists.jboss.org
Author: sboscarine
Date: 2009-11-12 20:11:32 -0500 (Thu, 12 Nov 2009)
New Revision: 5008
Modified:
extensions/trunk/archetypes/weld-jsf-minimal/
Log:
updated svn:ignore
Property changes on: extensions/trunk/archetypes/weld-jsf-minimal
___________________________________________________________________
Name: svn:ignore
+ .settings
target
.project
14 years, 10 months
Weld SVN: r5007 - in extensions/trunk/archetypes: weld-jsf-minimal and 1 other directory.
by weld-commits@lists.jboss.org
Author: sboscarine
Date: 2009-11-12 20:07:55 -0500 (Thu, 12 Nov 2009)
New Revision: 5007
Added:
extensions/trunk/archetypes/pom.xml
extensions/trunk/archetypes/weld-jsf-minimal/
extensions/trunk/archetypes/weld-jsf-minimal/pom.xml
extensions/trunk/archetypes/weld-jsf-minimal/src/
Log:
Initial import
Added: extensions/trunk/archetypes/pom.xml
===================================================================
--- extensions/trunk/archetypes/pom.xml (rev 0)
+++ extensions/trunk/archetypes/pom.xml 2009-11-13 01:07:55 UTC (rev 5007)
@@ -0,0 +1,46 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-parent</artifactId>
+ <version>5</version>
+ </parent>
+ <groupId>org.jboss.weld.archetype</groupId>
+ <artifactId>weld-archetype-parent</artifactId>
+ <version>0.0.1-BETA-SNAPSHOT</version>
+ <name>Weld Parent Archetype</name>
+ <description>This POM is the future home of configuration common to all archetypes.</description>
+ <url>http://sfwk.org/Documentation/WeldArchetypeProposal</url>
+ <!-- SCM and distribution management -->
+<!-- <scm>-->
+<!-- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/extensions/trunk</connection>-->
+<!-- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/extensions/trunk</developerConnection>-->
+<!-- <url>http://fisheye.jboss.org/browse/Weld</url>-->
+<!-- </scm>-->
+ <packaging>pom</packaging>
+ <developers>
+ <developer>
+ <name>Steven Boscarine</name>
+ <roles>
+ <role>Developer</role>
+ <role>Volunteer</role>
+ </roles>
+ <email>steven.boscarine(a)childrens.harvard.edu</email>
+ <organization>Children's Hospital Boston: Informatics Program</organization>
+ <organizationUrl>http://chip.org/</organizationUrl>
+ <url>http://info.rmatics.org/</url>
+ </developer>
+ </developers>
+ <dependencies />
+ <properties>
+ <!--
+ eliminates [WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform
+ dependent!
+ -->
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+ <modules>
+ <module>weld-jsf-minimal</module>
+ </modules>
+</project>
Added: extensions/trunk/archetypes/weld-jsf-minimal/pom.xml
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal/pom.xml (rev 0)
+++ extensions/trunk/archetypes/weld-jsf-minimal/pom.xml 2009-11-13 01:07:55 UTC (rev 5007)
@@ -0,0 +1,34 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.weld.archetype</groupId>
+ <artifactId>weld-archetype-parent</artifactId>
+ <version>0.0.1-BETA-SNAPSHOT</version>
+ </parent>
+ <artifactId>weld-jsf-minimal</artifactId>
+ <name>Archetype for JSF 2.0 and Weld 1.0</name>
+ <packaging>maven-archetype</packaging>
+ <build>
+ <extensions>
+ <!-- TODO: Explain what I do. -->
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ </extension>
+ </extensions>
+ <plugins>
+ <!-- TODO: Explain what I do. -->
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <!--
+ Ommitting a version throws this error:
+ [WARNING] Rule 1: org.apache.maven.plugins.enforcer.RequirePluginVersions failed with message:
+ Some plugins are missing valid versions:(LATEST RELEASE SNAPSHOT are not allowed )
+ -->
+ <version>2.0-alpha-4</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
14 years, 10 months
Weld SVN: r5006 - doc/trunk/reference/en-US.
by weld-commits@lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-11-12 18:51:49 -0500 (Thu, 12 Nov 2009)
New Revision: 5006
Modified:
doc/trunk/reference/en-US/scopescontexts.xml
Log:
some revisions
Modified: doc/trunk/reference/en-US/scopescontexts.xml
===================================================================
--- doc/trunk/reference/en-US/scopescontexts.xml 2009-11-12 23:46:52 UTC (rev 5005)
+++ doc/trunk/reference/en-US/scopescontexts.xml 2009-11-12 23:51:49 UTC (rev 5006)
@@ -102,7 +102,7 @@
</itemizedlist>
<note>
- <para>A CDI extension can support the conversation scope for other frameworks as well.</para>
+ <para>A CDI extension can implement support for the conversation scope in other web frameworks.</para>
</note>
<para>The request and application scopes are also active:</para>
@@ -132,6 +132,11 @@
If the application tries to invoke a bean with a scope that does not have an active context, a
<literal>ContextNotActiveException</literal> is thrown by the container at runtime.
</para>
+
+ <para>
+ Managed beans with scope <literal>@SessionScoped</literal> or <literal>@ConversationScoped</literal> must be
+ serializable, since the container passivates the HTTP session from time to time.
+ </para>
<para>
Three of the four built-in scopes should be extremely familiar to every Java EE developer, so let's not waste
@@ -294,7 +299,7 @@
<para>
In addition to the four built-in scopes, CDI also supports two <emphasis>pseudo-scopes</emphasis>. The first
- is the <literal>singleton pseudo-scope</literal>, which we specify using the annotation <literal>@Singleton</literal>.
+ is the <emphasis>singleton pseudo-scope</emphasis>, which we specify using the annotation <literal>@Singleton</literal>.
</para>
<note>
@@ -341,7 +346,7 @@
</listitem>
</itemizedlist>
- <para>A third, better solution is to instead use <literal>@ApplicationScoped</literal>, allowing the container to
+ <para>A fourth, better solution is to instead use <literal>@ApplicationScoped</literal>, allowing the container to
proxy the bean, and take care of serialization problems automatically.</para>
</section>
14 years, 10 months
Weld SVN: r5004 - in core/branches: 1.0.0 and 2 other directories.
by weld-commits@lists.jboss.org
Author: rogerk
Date: 2009-11-12 18:46:37 -0500 (Thu, 12 Nov 2009)
New Revision: 5004
Added:
core/branches/1.0.0/
core/branches/1.0.0/bom/pom.xml
core/branches/1.0.0/osgi-bundle/pom.xml
core/branches/1.0.0/pom.xml
Removed:
core/branches/1.0.0/bom/pom.xml
core/branches/1.0.0/osgi-bundle/pom.xml
core/branches/1.0.0/pom.xml
Log:
[maven-release-plugin] copy for branch 1.0.0
Copied: core/branches/1.0.0 (from rev 4920, core/tags/1.0.0)
Deleted: core/branches/1.0.0/bom/pom.xml
===================================================================
--- core/tags/1.0.0/bom/pom.xml 2009-11-10 00:14:11 UTC (rev 4920)
+++ core/branches/1.0.0/bom/pom.xml 2009-11-12 23:46:37 UTC (rev 5004)
@@ -1,183 +0,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>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-bom</artifactId>
- <packaging>pom</packaging>
- <version>1.0.0</version>
-
- <parent>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-parent</artifactId>
- <version>6</version>
- </parent>
-
- <name>Weld Core BOM</name>
- <url>http://www.seamframework.org/Weld</url>
-
- <!-- Minimal project metadata, for more see parent/pom.xml -->
- <description>Weld Core "bill of materials" which can be imported by any project using the Weld implementation of CDI. It provides dependency management for the implementation.</description>
-
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <distribution>repo</distribution>
- <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
- </license>
- </licenses>
-
- <developers>
- <developer>
- <name>Weld committers</name>
- </developer>
- </developers>
-
- <!-- Dependency management, including extra repositories if needed -->
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Release Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <url>http://snapshots.jboss.org/maven2</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- <repository>
- <id>oss.sonatype.org/jboss-snapshots</id>
- <name>JBoss (Nexus) Snapshots Repository</name>
- <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
-
- <properties>
- <weld.api.version>1.0</weld.api.version>
- <google.collections.version>1.0-rc3</google.collections.version>
- <javassist.version>3.11.0.GA</javassist.version>
- <cdi.tck.version>1.0.0-CR7</cdi.tck.version>
- <atinject.tck.version>1.0.0-PFD-3</atinject.tck.version>
- <jboss.interceptor.version>1.0.0-CR8</jboss.interceptor.version>
- <slf4j.version>1.5.9.RC1</slf4j.version>
- <cal10n.version>0.7.2</cal10n.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-api-bom</artifactId>
- <version>${weld.api.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>${javassist.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-porting-package</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-test</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.jsr299.tck</groupId>
- <artifactId>jsr299-tck-api</artifactId>
- <version>${cdi.tck.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.jsr299.tck</groupId>
- <artifactId>jsr299-tck-impl</artifactId>
- <version>${cdi.tck.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.atinject</groupId>
- <artifactId>inject-tck</artifactId>
- <version>${atinject.tck.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.interceptor</groupId>
- <artifactId>jboss-interceptor</artifactId>
- <version>${jboss.interceptor.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <version>${google.collections.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-ext</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>ch.qos</groupId>
- <artifactId>cal10n-api</artifactId>
- <version>${cal10n.version}</version>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
- <!-- SCM and distribution management -->
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.0/bom</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0/bom</developerConnection>
- <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0/core/bom</url>
- </scm>
-
-</project>
Copied: core/branches/1.0.0/bom/pom.xml (from rev 5003, core/tags/1.0.0/bom/pom.xml)
===================================================================
--- core/branches/1.0.0/bom/pom.xml (rev 0)
+++ core/branches/1.0.0/bom/pom.xml 2009-11-12 23:46:37 UTC (rev 5004)
@@ -0,0 +1,183 @@
+<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>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-bom</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0.0</version>
+
+ <parent>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-parent</artifactId>
+ <version>6</version>
+ </parent>
+
+ <name>Weld Core BOM</name>
+ <url>http://www.seamframework.org/Weld</url>
+
+ <!-- Minimal project metadata, for more see parent/pom.xml -->
+ <description>Weld Core "bill of materials" which can be imported by any project using the Weld implementation of CDI. It provides dependency management for the implementation.</description>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <distribution>repo</distribution>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ </license>
+ </licenses>
+
+ <developers>
+ <developer>
+ <name>Weld committers</name>
+ </developer>
+ </developers>
+
+ <!-- Dependency management, including extra repositories if needed -->
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Release Repository</name>
+ <url>http://repository.jboss.org/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>http://snapshots.jboss.org/maven2</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>oss.sonatype.org/jboss-snapshots</id>
+ <name>JBoss (Nexus) Snapshots Repository</name>
+ <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <properties>
+ <weld.api.version>1.0</weld.api.version>
+ <google.collections.version>1.0-rc3</google.collections.version>
+ <javassist.version>3.11.0.GA</javassist.version>
+ <cdi.tck.version>1.0.0-CR7</cdi.tck.version>
+ <atinject.tck.version>1.0.0-PFD-3</atinject.tck.version>
+ <jboss.interceptor.version>1.0.0-CR8</jboss.interceptor.version>
+ <slf4j.version>1.5.9.RC1</slf4j.version>
+ <cal10n.version>0.7.2</cal10n.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api-bom</artifactId>
+ <version>${weld.api.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-porting-package</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-test</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-api</artifactId>
+ <version>${cdi.tck.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-impl</artifactId>
+ <version>${cdi.tck.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.atinject</groupId>
+ <artifactId>inject-tck</artifactId>
+ <version>${atinject.tck.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor</artifactId>
+ <version>${jboss.interceptor.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
+ <version>${google.collections.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-ext</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos</groupId>
+ <artifactId>cal10n-api</artifactId>
+ <version>${cal10n.version}</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- SCM and distribution management -->
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0/bom</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.0/bom</developerConnection>
+ <url>https://svn.jboss.org/repos/weld/core/tags/1.0.0/core/bom</url>
+ </scm>
+
+</project>
Deleted: core/branches/1.0.0/osgi-bundle/pom.xml
===================================================================
--- core/tags/1.0.0/osgi-bundle/pom.xml 2009-11-10 00:14:11 UTC (rev 4920)
+++ core/branches/1.0.0/osgi-bundle/pom.xml 2009-11-12 23:46:37 UTC (rev 5004)
@@ -1,185 +0,0 @@
-
- <!--
- /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * *
- Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. *
- * Use is subject to license terms. * * Licensed 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. */
- -->
-<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">
- <parent>
- <artifactId>weld-core-parent</artifactId>
- <groupId>org.jboss.weld</groupId>
- <version>1.0.0</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-osgi-bundle</artifactId>
- <name>Weld OSGi Bundle</name>
- <description>Weld runtime packaged as an OSGi bundle</description>
-
- <developers>
- <developer>
- <id>ss141213</id>
- <name>Sanjeeb Sahoo</name>
- <url>http://weblogs.dev.java.net/ss141213</url>
- <organization>Sun Microsystems, Inc.</organization>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- <developer>
- <name>Roger Kitain</name>
- <id>rogerk</id>
- <organization>Sun Microsystems, Inc.</organization>
- </developer>
- </developers>
-
- <properties>
- <osgi.version>1.0</osgi.version>
- </properties>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <_include>-osgi.bundle</_include>
-
- <Embed-Dependency>*; scope=compile; inline=true, slf4j-jdk14; inline=true</Embed-Dependency>
-
- <_exportcontents>
- javax.inject;
- javax.enterprise.*;
- version=${osgi.version},
- org.jboss.weld.context;
- org.jboss.weld.ejb;
- org.jboss.weld.bean;
- org.jboss.weld.bean.proxy;
- org.jboss.weld.*.api.*;
- org.jboss.weld.*.spi.*;
- org.jboss.weld.conversation;
- org.jboss.weld;
- org.jboss.weld.bootstrap;
- org.jboss.weld.introspector;
- org.jboss.weld.servlet;
- org.jboss.interceptor.*;
- version=${osgi.version},
- org.jboss.weld.el;
- version=${osgi.version},
- org.jboss.weld.jsf;
- include:="WeldPhaseListener";
- version=${osgi.version},
- javassist.util.proxy;version=${javassist.version}
- </_exportcontents>
-
- <!-- A note about how slf4j is handled:
- We optionally import slf4j APIs (i.e. packages that are part of slf4j-api.jar).
- We also bundle them privately along with the jdk14-logging binding.
- This allows us to function even when there is no separate slf4j bundle.
- When there is a separate slf4j bundle, because of our optional Import-Package header,
- we will get wired to that bundle. Please also note that we don't import impl package,
- as it is sufficient to import just the api. In some other environment, user can
- deploy slf4j-api bundle and their desired binding bundle. The binding bundle is
- a fragement which attaches itself to the api bundle. We will get wired to the
- api bundle and everything will work.
- We also bundle all the slf4j extension and cal10n stuff to avoid having dependency
- on foreign bundles.
- -->
- <Import-Package>
- org.slf4j; org.slf4j.spi; org.slf4j.helpers; version=${slf4j.version}; resolution:=optional,
- ch.qos.cal10n; version=${cal10n.version}; resolution:=optional,
- javax.interceptor.*, *;
- resolution:=optional
- </Import-Package>
-
- <Private-Package>
- !javax.interceptor.*, org.slf4j.*; -split-package:=merge-first, ch.qos.cal10n.*
- </Private-Package>
-
- </instructions>
-
- <!--
- Maven uses the output directory (target/classes)
- rather than the final bundle, when compiling against
- projects in the same reactor (ie. the same build).
- Since this jar comprises of classes that come from
- some other jar and other modules may depend on this
- artifact, we need to unpack.
- -->
- <unpackBundle>true</unpackBundle>
- </configuration>
- <executions>
- <execution>
- <id>osgi-bundle</id>
- <goals>
- <goal>bundle</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-spi</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.interceptor</groupId>
- <artifactId>jboss-interceptor</artifactId>
- </dependency>
-
- <!-- We bundle jdk binding inside this OSGi bundle -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-
-</project>
Copied: core/branches/1.0.0/osgi-bundle/pom.xml (from rev 5003, core/tags/1.0.0/osgi-bundle/pom.xml)
===================================================================
--- core/branches/1.0.0/osgi-bundle/pom.xml (rev 0)
+++ core/branches/1.0.0/osgi-bundle/pom.xml 2009-11-12 23:46:37 UTC (rev 5004)
@@ -0,0 +1,186 @@
+
+ <!--
+ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * *
+ Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. *
+ * Use is subject to license terms. * * Licensed 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. */
+ -->
+<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">
+ <parent>
+ <artifactId>weld-core-parent</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <version>1.0.0</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-osgi-bundle</artifactId>
+ <name>Weld OSGi Bundle</name>
+ <description>Weld runtime packaged as an OSGi bundle</description>
+
+ <developers>
+ <developer>
+ <id>ss141213</id>
+ <name>Sanjeeb Sahoo</name>
+ <url>http://weblogs.dev.java.net/ss141213</url>
+ <organization>Sun Microsystems, Inc.</organization>
+ <roles>
+ <role>developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Roger Kitain</name>
+ <id>rogerk</id>
+ <organization>Sun Microsystems, Inc.</organization>
+ </developer>
+ </developers>
+
+ <properties>
+ <osgi.version>1.0</osgi.version>
+ </properties>
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <_include>-osgi.bundle</_include>
+
+ <Embed-Dependency>*; scope=compile; inline=true, slf4j-jdk14; inline=true</Embed-Dependency>
+
+ <_exportcontents>
+ javax.inject;
+ javax.enterprise.*;
+ javax.decorator.*;
+ version=${osgi.version},
+ org.jboss.weld.context;
+ org.jboss.weld.ejb;
+ org.jboss.weld.bean;
+ org.jboss.weld.bean.proxy;
+ org.jboss.weld.*.api.*;
+ org.jboss.weld.*.spi.*;
+ org.jboss.weld.conversation;
+ org.jboss.weld;
+ org.jboss.weld.bootstrap;
+ org.jboss.weld.introspector;
+ org.jboss.weld.servlet;
+ org.jboss.interceptor.*;
+ version=${osgi.version},
+ org.jboss.weld.el;
+ version=${osgi.version},
+ org.jboss.weld.jsf;
+ include:="WeldPhaseListener";
+ version=${osgi.version},
+ javassist.util.proxy;version=${javassist.version}
+ </_exportcontents>
+
+ <!-- A note about how slf4j is handled:
+ We optionally import slf4j APIs (i.e. packages that are part of slf4j-api.jar).
+ We also bundle them privately along with the jdk14-logging binding.
+ This allows us to function even when there is no separate slf4j bundle.
+ When there is a separate slf4j bundle, because of our optional Import-Package header,
+ we will get wired to that bundle. Please also note that we don't import impl package,
+ as it is sufficient to import just the api. In some other environment, user can
+ deploy slf4j-api bundle and their desired binding bundle. The binding bundle is
+ a fragement which attaches itself to the api bundle. We will get wired to the
+ api bundle and everything will work.
+ We also bundle all the slf4j extension and cal10n stuff to avoid having dependency
+ on foreign bundles.
+ -->
+ <Import-Package>
+ org.slf4j; org.slf4j.spi; org.slf4j.helpers; version=${slf4j.version}; resolution:=optional,
+ ch.qos.cal10n; version=${cal10n.version}; resolution:=optional,
+ javax.interceptor.*, *;
+ resolution:=optional
+ </Import-Package>
+
+ <Private-Package>
+ !javax.interceptor.*, org.slf4j.*; -split-package:=merge-first, ch.qos.cal10n.*
+ </Private-Package>
+
+ </instructions>
+
+ <!--
+ Maven uses the output directory (target/classes)
+ rather than the final bundle, when compiling against
+ projects in the same reactor (ie. the same build).
+ Since this jar comprises of classes that come from
+ some other jar and other modules may depend on this
+ artifact, we need to unpack.
+ -->
+ <unpackBundle>true</unpackBundle>
+ </configuration>
+ <executions>
+ <execution>
+ <id>osgi-bundle</id>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-spi</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor</artifactId>
+ </dependency>
+
+ <!-- We bundle jdk binding inside this OSGi bundle -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Deleted: core/branches/1.0.0/pom.xml
===================================================================
--- core/tags/1.0.0/pom.xml 2009-11-10 00:14:11 UTC (rev 4920)
+++ core/branches/1.0.0/pom.xml 2009-11-12 23:46:37 UTC (rev 5004)
@@ -1,76 +0,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>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-build-aggregator</artifactId>
- <packaging>pom</packaging>
- <version>1.0.0</version>
-
- <parent>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-parent</artifactId>
- <version>6</version>
- </parent>
-
- <name>Weld Build Aggregator</name>
-
- <!-- Minimal metadata -->
- <description>The build aggregator for Weld, which takes care of calling the modules which make up Weld</description>
-
- <!-- SCM and distribution management -->
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.0</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0</developerConnection>
- <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0</url>
- </scm>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>bom</module>
- <module>parent</module>
- <module>impl</module>
- <module>tests</module>
- <module>porting-package</module>
- <module>inject-tck-runner</module>
- <module>jboss-tck-runner</module>
- <module>osgi-bundle</module>
- </modules>
- </profile>
- <profile>
- <id>skip-tests</id>
- <modules>
- <module>bom</module>
- <module>parent</module>
- <module>impl</module>
- <module>osgi-bundle</module>
- </modules>
- </profile>
- </profiles>
-
- <!-- Minimal build configuration -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.jboss.org/repos/weld/core/tags</tagBase>
- <!-- As we need access to our own artifacts -->
- <preparationGoals>install</preparationGoals>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
Copied: core/branches/1.0.0/pom.xml (from rev 5003, core/tags/1.0.0/pom.xml)
===================================================================
--- core/branches/1.0.0/pom.xml (rev 0)
+++ core/branches/1.0.0/pom.xml 2009-11-12 23:46:37 UTC (rev 5004)
@@ -0,0 +1,76 @@
+<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>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-build-aggregator</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0.0</version>
+
+ <parent>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-parent</artifactId>
+ <version>6</version>
+ </parent>
+
+ <name>Weld Build Aggregator</name>
+
+ <!-- Minimal metadata -->
+ <description>The build aggregator for Weld, which takes care of calling the modules which make up Weld</description>
+
+ <!-- SCM and distribution management -->
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.0</developerConnection>
+ <url>https://svn.jboss.org/repos/weld/core/tags/1.0.0</url>
+ </scm>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>bom</module>
+ <module>parent</module>
+ <module>impl</module>
+ <module>tests</module>
+ <module>porting-package</module>
+ <module>inject-tck-runner</module>
+ <module>jboss-tck-runner</module>
+ <module>osgi-bundle</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>skip-tests</id>
+ <modules>
+ <module>bom</module>
+ <module>parent</module>
+ <module>impl</module>
+ <module>osgi-bundle</module>
+ </modules>
+ </profile>
+ </profiles>
+
+ <!-- Minimal build configuration -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.jboss.org/repos/weld/core/tags</tagBase>
+ <!-- As we need access to our own artifacts -->
+ <preparationGoals>install</preparationGoals>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
14 years, 10 months
Weld SVN: r5002 - doc/trunk/reference.
by weld-commits@lists.jboss.org
Author: dan.j.allen
Date: 2009-11-12 17:41:09 -0500 (Thu, 12 Nov 2009)
New Revision: 5002
Modified:
doc/trunk/reference/README.txt
Log:
note about dashes
Modified: doc/trunk/reference/README.txt
===================================================================
--- doc/trunk/reference/README.txt 2009-11-12 20:23:12 UTC (rev 5001)
+++ doc/trunk/reference/README.txt 2009-11-12 22:41:09 UTC (rev 5002)
@@ -20,6 +20,13 @@
Generally, the text in paragraphs should appear on separate lines from the <para> tags, but there are some cases when
this formatting rule has been relaxed.
+Please use the following two entity codes for inserting dashes:
+
+– - ndash
+— - mdash
+
+The DocType transformation stylesheet does not handle &ndash, &mdash, – or — properly.
+
Bug in IcedTea
==============
14 years, 10 months
Weld SVN: r5001 - doc/trunk/reference/en-US.
by weld-commits@lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-11-12 15:23:12 -0500 (Thu, 12 Nov 2009)
New Revision: 5001
Modified:
doc/trunk/reference/en-US/scopescontexts.xml
Log:
async methods and messagelisteners
Modified: doc/trunk/reference/en-US/scopescontexts.xml
===================================================================
--- doc/trunk/reference/en-US/scopescontexts.xml 2009-11-12 20:20:15 UTC (rev 5000)
+++ doc/trunk/reference/en-US/scopescontexts.xml 2009-11-12 20:23:12 UTC (rev 5001)
@@ -112,12 +112,18 @@
<para>during invocations of EJB remote methods,</para>
</listitem>
<listitem>
+ <para>during invocations of EJB asynchronous methods,</para>
+ </listitem>
+ <listitem>
<para>during EJB timeouts,</para>
</listitem>
<listitem>
- <para>during message delivery to a message-driven bean, and</para>
+ <para>during message delivery to a message-driven bean,</para>
</listitem>
<listitem>
+ <para>during message delivery to a <literal>MessageListener</literal>, and</para>
+ </listitem>
+ <listitem>
<para>during web service invocations.</para>
</listitem>
</itemizedlist>
14 years, 10 months
Weld SVN: r5000 - api/trunk/cdi/src/main/java/javax/enterprise/context.
by weld-commits@lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-11-12 15:20:15 -0500 (Thu, 12 Nov 2009)
New Revision: 5000
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/context/ApplicationScoped.java
api/trunk/cdi/src/main/java/javax/enterprise/context/RequestScoped.java
Log:
oopsie!
Modified: api/trunk/cdi/src/main/java/javax/enterprise/context/ApplicationScoped.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/context/ApplicationScoped.java 2009-11-12 20:14:27 UTC (rev 4999)
+++ api/trunk/cdi/src/main/java/javax/enterprise/context/ApplicationScoped.java 2009-11-12 20:20:15 UTC (rev 5000)
@@ -40,7 +40,6 @@
* <tt>ServletContextListener</tt>, <tt>HttpSessionListener</tt>,
* <tt>AsyncListener</tt> or <tt>ServletRequestListener</tt>,</li>
* <li>during any Java EE web service invocation,</li>
- * <li>during any asynchronous observer method notification,</li>
* <li>during any remote method invocation of any EJB, during
* any asynchronous method invocation of any EJB, during any
* call to an EJB timeout method and during message delivery
@@ -53,13 +52,12 @@
* is called.</li>
* </ul>
*
- * <p>The application context is shared between all servlet
- * requests, asynchronous observer method notifications, web
- * service invocations, EJB remote method invocations, EJB
+ * <p>The application context is shared between all servlet requests,
+ * web service invocations, EJB remote method invocations, EJB
* asynchronous method invocations, EJB timeouts and message
- * deliveries to message-driven beans that execute within the
- * same application. The application context is destroyed when
- * the application is shut down.</p>
+ * deliveries to message-driven beans that execute within the same
+ * application. The application context is destroyed when the
+ * application is shut down.</p>
*
* @author Gavin King
* @author Pete Muir
Modified: api/trunk/cdi/src/main/java/javax/enterprise/context/RequestScoped.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/context/RequestScoped.java 2009-11-12 20:14:27 UTC (rev 4999)
+++ api/trunk/cdi/src/main/java/javax/enterprise/context/RequestScoped.java 2009-11-12 20:20:15 UTC (rev 5000)
@@ -38,7 +38,6 @@
* filter and when the container calls any <tt>ServletRequestListener</tt>
* or <tt>AsyncListener</tt>,</li>
* <li>during any Java EE web service invocation,</li>
- * <li>during any asynchronous observer method notification,</li>
* <li>during any remote method invocation of any EJB, during
* any asynchronous method invocation of any EJB, during any
* call to an EJB timeout method and during message delivery
@@ -55,7 +54,6 @@
* method, all <tt>doFilter()</tt> methods, and all <tt>requestDestroyed()</tt>
* and <tt>onComplete()</tt> notifications return,</li>
* <li>after the web service invocation completes,</li>
- * <li>after the asynchronous observer notification completes,</li>
* <li>after the EJB remote method invocation, asynchronous
* method invocation, timeout or message delivery completes, or</li>
* <li>after the message delivery to the <tt>MessageListener</tt>
14 years, 10 months