Weld SVN: r5049 - in extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources: archetype-resources/src/main/webapp/WEB-INF and 1 other directory.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-13 12:50:09 -0500 (Fri, 13 Nov 2009)
New Revision: 5049
Modified:
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/META-INF/archetype.xml
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
Log:
include faces-config.xml for writing navigtion rules
Modified: 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 2009-11-13 17:40:36 UTC (rev 5048)
+++ extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/META-INF/archetype.xml 2009-11-13 17:50:09 UTC (rev 5049)
@@ -4,6 +4,7 @@
<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/webapp/WEB-INF/faces-config.xml</resource>
<resource>src/main/resources/META-INF/beans.xml</resource>
<resource>src/main/webapp/META-INF/context.xml</resource>
</resources>
@@ -14,4 +15,4 @@
<testResources>
<resource>src/test/resources/jetty-env.xml</resource>
</testResources>
-</archetype>
\ No newline at end of file
+</archetype>
Modified: 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 2009-11-13 17:40:36 UTC (rev 5048)
+++ extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml 2009-11-13 17:50:09 UTC (rev 5049)
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!-- This file is optional. It can be deleted at any time. -->
+<!-- This file is not required if you don't need any extra configuration. -->
<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
+
+ <!-- Write your navigation rules here. You are encouraged to use CDI for creating @Named managed beans. -->
+
+</faces-config>
16 years, 5 months
Weld SVN: r5048 - in extensions/trunk/faces/src/main/java/org/jboss: weldx and 1 other directories.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-13 12:40:36 -0500 (Fri, 13 Nov 2009)
New Revision: 5048
Added:
extensions/trunk/faces/src/main/java/org/jboss/weldx/faces/
extensions/trunk/faces/src/main/java/org/jboss/weldx/faces/FacesContextProducer.java
Removed:
extensions/trunk/faces/src/main/java/org/jboss/weld/faces/
Log:
change package to org.jboss.weldx to avoid conflicts with core
Copied: extensions/trunk/faces/src/main/java/org/jboss/weldx/faces/FacesContextProducer.java (from rev 5047, extensions/trunk/faces/src/main/java/org/jboss/weld/faces/FacesContextProducer.java)
===================================================================
--- extensions/trunk/faces/src/main/java/org/jboss/weldx/faces/FacesContextProducer.java (rev 0)
+++ extensions/trunk/faces/src/main/java/org/jboss/weldx/faces/FacesContextProducer.java 2009-11-13 17:40:36 UTC (rev 5048)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * 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.
+ */
+
+package org.jboss.weldx.faces;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
+import javax.faces.context.FacesContext;
+
+/**
+ * <p>
+ * A producer which retrieves the current JSF FacesContext by calling
+ * {@link FacesContext#getCurrentInstance}, thus allowing it to be injected.
+ * </p>
+ *
+ * @author Gavin King
+ * @author Dan Allen
+ */
+public class FacesContextProducer
+{
+ public
+ @Produces
+ @RequestScoped
+ FacesContext getFacesContext()
+ {
+ return FacesContext.getCurrentInstance();
+ }
+}
16 years, 5 months
Weld SVN: r5046 - build/trunk/dist.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-13 11:52:16 -0500 (Fri, 13 Nov 2009)
New Revision: 5046
Modified:
build/trunk/dist/build.xml
build/trunk/dist/readme.txt
Log:
move stuff around in the dist a bit
Modified: build/trunk/dist/build.xml
===================================================================
--- build/trunk/dist/build.xml 2009-11-13 16:49:03 UTC (rev 5045)
+++ build/trunk/dist/build.xml 2009-11-13 16:52:16 UTC (rev 5046)
@@ -10,8 +10,10 @@
<property name="maven.dir" location="${parent.dir}/lib/maven" />
- <property name="dist.dir" value="${basedir}/weld-${weld.version}" />
- <property name="dist.wb.lib.dir" value="${dist.dir}/lib/weld" />
+ <property name="final.name" value="weld-${weld.version}" />
+ <property name="dist.dir" value="${basedir}/${final.name}" />
+ <property name="dist.weld.lib.dir" value="${dist.dir}/artifacts/weld" />
+ <property name="dist.cdi.lib.dir" value="${dist.dir}/artifacts/cdi" />
<property name="dist.doc.dir" value="${dist.dir}/doc" />
<property name="dist.apidocs.dir" value="${dist.dir}/doc/apidocs" />
@@ -28,10 +30,7 @@
<fail unless="weld.version" message="You must specify the weld.version as a property" />
<fail unless="weld.api.version" message="You must specify the weld.api.version as a property" />
- <fail unless="weld.servlet.version" message="You must specify the weld.servlet.version as a property" />
- <fail unless="weld.se.version" message="You must specify the weld.se.version as a property" />
- <fail unless="weld.wicket.version" message="You must specify the weld.wicket.version as a property" />
- <fail unless="weld.logger.version" message="You must specify the weld.logger.version as a property" />
+ <fail unless="weld.extensions.version" message="You must specify the weld.extensions.version as a property" />
<fail unless="weld.dir" message="You must specify the examples directory with -Dweld.dir=~/workspace/weld" />
<fail unless="examples.dir" message="You must specify the examples directory with -Dexamples.dir=~/workspace/examples" />
@@ -57,12 +56,12 @@
<dependency groupId="javax.enterprise" artifactId="cdi-api" version="${weld.api.version}" />
<dependency groupId="org.jboss.weld" artifactId="weld-core" version="${weld.version}" />
<dependency groupId="org.jboss.weld" artifactId="weld-spi" version="${weld.api.version}" />
- <dependency groupId="org.jboss.weld" artifactId="weld-logger" version="${weld.logger.version}" />
- <dependency groupId="org.jboss.weld" artifactId="weld-wicket" version="${weld.wicket.version}" />
- <dependency groupId="org.jboss.weld" artifactId="weld-se" version="${weld.se.version}" />
- <dependency groupId="org.jboss.weld.servlet" artifactId="weld-servlet" version="${weld.servlet.version}" />
- <dependency groupId="org.jboss.weld.servlet" artifactId="weld-servlet-int" version="${weld.servlet.version}" />
- <dependency groupId="org.jboss.weld.servlet" artifactId="weld-tomcat-support" version="${weld.servlet.version}" />
+ <dependency groupId="org.jboss.weld" artifactId="weld-logger" version="${weld.extensions.version}" />
+ <dependency groupId="org.jboss.weld" artifactId="weld-wicket" version="${weld.extensions.version}" />
+ <dependency groupId="org.jboss.weld" artifactId="weld-se" version="${weld.extensions.version}" />
+ <dependency groupId="org.jboss.weld.servlet" artifactId="weld-servlet" version="${weld.extensions.version}" />
+ <dependency groupId="org.jboss.weld.servlet" artifactId="weld-servlet-int" version="${weld.extensions.version}" />
+ <dependency groupId="org.jboss.weld.servlet" artifactId="weld-tomcat-support" version="${weld.extensions.version}" />
<remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" />
</artifact:dependencies>
@@ -82,23 +81,30 @@
<unzip dest="${dist.apidocs.dir}">
<fileset dir="target">
<include name="cdi-api-javadoc.jar" />
- <include name="weld-api-javadoc.jar" />
</fileset>
</unzip>
- <mkdir dir="${dist.wb.lib.dir}" />
+ <mkdir dir="${dist.weld.lib.dir}" />
- <copy todir="${dist.wb.lib.dir}">
+ <copy todir="${dist.weld.lib.dir}">
<fileset dir="target">
<include name="weld-*.jar" />
- <include name="jsr299-api*.jar" />
</fileset>
</copy>
+
+ <mkdir dir="${dist.cdi.lib.dir}" />
+
+ <copy todir="${dist.cdi.lib.dir}">
+ <fileset dir="target">
+ <include name="cdi-api*.jar" />
+ </fileset>
+ </copy>
+
<delete dir="target" failonerror="false" />
- <zip destfile="weld-${weld.version}.zip">
+ <zip destfile="${final.name}.zip">
<fileset dir="${basedir}">
- <include name="weld-${weld.version}/**" />
+ <include name="${final.name}/**" />
</fileset>
</zip>
</target>
Modified: build/trunk/dist/readme.txt
===================================================================
--- build/trunk/dist/readme.txt 2009-11-13 16:49:03 UTC (rev 5045)
+++ build/trunk/dist/readme.txt 2009-11-13 16:52:16 UTC (rev 5046)
@@ -53,10 +53,14 @@
Libraries, for building the examples
- lib/weld
+ artifacts/weld
Weld binary, source and javadoc jars
+ artifacts/cdi
+
+ CDI API binary, source and javadoc jars
+
Licensing
=========
16 years, 5 months
Weld SVN: r5045 - doc/tags/weld-reference-guide-1.0.0.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-13 11:49:03 -0500 (Fri, 13 Nov 2009)
New Revision: 5045
Modified:
doc/tags/weld-reference-guide-1.0.0/pom.xml
Log:
update styles used
Modified: doc/tags/weld-reference-guide-1.0.0/pom.xml
===================================================================
--- doc/tags/weld-reference-guide-1.0.0/pom.xml 2009-11-13 16:29:16 UTC (rev 5044)
+++ doc/tags/weld-reference-guide-1.0.0/pom.xml 2009-11-13 16:49:03 UTC (rev 5045)
@@ -31,7 +31,7 @@
<properties>
<pdf.name>weld-reference.pdf</pdf.name>
- <weld.docbook.version>1.1.1-Beta4</weld.docbook.version>
+ <weld.docbook.version>1.1.1-Beta5</weld.docbook.version>
</properties>
<build>
16 years, 5 months
Weld SVN: r5044 - core/trunk/bom.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-13 11:29:16 -0500 (Fri, 13 Nov 2009)
New Revision: 5044
Modified:
core/trunk/bom/pom.xml
Log:
fix jta problem, use released tck
Modified: core/trunk/bom/pom.xml
===================================================================
--- core/trunk/bom/pom.xml 2009-11-13 16:28:23 UTC (rev 5043)
+++ core/trunk/bom/pom.xml 2009-11-13 16:29:16 UTC (rev 5044)
@@ -74,7 +74,7 @@
<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>
+ <cdi.tck.version>1.0.0</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>
@@ -90,6 +90,13 @@
<version>${weld.api.version}</version>
<scope>import</scope>
<type>pom</type>
+ </dependency>
+
+ <!-- Remove when we switch the API to 1.1 -->
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.1</version>
</dependency>
<dependency>
16 years, 5 months
Weld SVN: r5043 - core/trunk/porting-package.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-13 11:28:23 -0500 (Fri, 13 Nov 2009)
New Revision: 5043
Modified:
core/trunk/porting-package/pom.xml
Log:
ws
Modified: core/trunk/porting-package/pom.xml
===================================================================
--- core/trunk/porting-package/pom.xml 2009-11-13 16:26:55 UTC (rev 5042)
+++ core/trunk/porting-package/pom.xml 2009-11-13 16:28:23 UTC (rev 5043)
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-test</artifactId>
+ <artifactId>weld-core-test</artifactId>
</dependency>
</dependencies>
16 years, 5 months
Weld SVN: r5042 - core/trunk/jboss-as.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-13 11:26:55 -0500 (Fri, 13 Nov 2009)
New Revision: 5042
Modified:
core/trunk/jboss-as/build.properties
Log:
use snapshots of weld
Modified: core/trunk/jboss-as/build.properties
===================================================================
--- core/trunk/jboss-as/build.properties 2009-11-13 16:26:20 UTC (rev 5041)
+++ core/trunk/jboss-as/build.properties 2009-11-13 16:26:55 UTC (rev 5042)
@@ -8,7 +8,7 @@
# maximum number of TCK tests to deploy before restarting JBoss AS
# jboss.deployments.restart = 25
weld-deployer.version=5.2.0-SNAPSHOT
-weld.version=1.0.0-SNAPSHOT
+weld.version=1.0.1-SNAPSHOT
jboss-ejb3.version=1.0.0
javassist.version=3.11.0.GA
validation.version=1.0.CR3
16 years, 5 months
Weld SVN: r5041 - in cdi-tck/branches/1.0.0: api and 2 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-13 11:26:20 -0500 (Fri, 13 Nov 2009)
New Revision: 5041
Modified:
cdi-tck/branches/1.0.0/api/pom.xml
cdi-tck/branches/1.0.0/doc/reference/pom.xml
cdi-tck/branches/1.0.0/impl/pom.xml
cdi-tck/branches/1.0.0/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: cdi-tck/branches/1.0.0/api/pom.xml
===================================================================
--- cdi-tck/branches/1.0.0/api/pom.xml 2009-11-13 16:26:09 UTC (rev 5040)
+++ cdi-tck/branches/1.0.0/api/pom.xml 2009-11-13 16:26:20 UTC (rev 5041)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-parent</artifactId>
- <version>1.0.0-SP1</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.jsr299.tck</groupId>
Modified: cdi-tck/branches/1.0.0/doc/reference/pom.xml
===================================================================
--- cdi-tck/branches/1.0.0/doc/reference/pom.xml 2009-11-13 16:26:09 UTC (rev 5040)
+++ cdi-tck/branches/1.0.0/doc/reference/pom.xml 2009-11-13 16:26:20 UTC (rev 5041)
@@ -19,13 +19,14 @@
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-reference-guide</artifactId>
+ <version>1.0.0</version>
<packaging>jdocbook</packaging>
<name>JSR-299 TCK Reference Guide</name>
<parent>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-parent</artifactId>
- <version>1.0.0-SP1</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -61,9 +62,9 @@
</build>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/tags/1.0.0-SP1</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0.0-SP1</developerConnection>
- <url>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/jsr299-tck-referenc...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/tags/1.0.0</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0.0</developerConnection>
+ <url>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/jsr299-tck-referenc...</url>
</scm>
</project>
Modified: cdi-tck/branches/1.0.0/impl/pom.xml
===================================================================
--- cdi-tck/branches/1.0.0/impl/pom.xml 2009-11-13 16:26:09 UTC (rev 5040)
+++ cdi-tck/branches/1.0.0/impl/pom.xml 2009-11-13 16:26:20 UTC (rev 5041)
@@ -3,7 +3,7 @@
<parent>
<artifactId>jsr299-tck-parent</artifactId>
<groupId>org.jboss.jsr299.tck</groupId>
- <version>1.0.0-SP1</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jsr299.tck</groupId>
Modified: cdi-tck/branches/1.0.0/pom.xml
===================================================================
--- cdi-tck/branches/1.0.0/pom.xml 2009-11-13 16:26:09 UTC (rev 5040)
+++ cdi-tck/branches/1.0.0/pom.xml 2009-11-13 16:26:20 UTC (rev 5041)
@@ -4,7 +4,7 @@
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SP1</version>
+ <version>1.0.0-SNAPSHOT</version>
<name>CDI TCK</name>
<parent>
@@ -303,11 +303,11 @@
</build>
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0.0-SP1</connection>
+ <connection>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0.0</connection>
<developerConnection>
- scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0.0-SP1
+ scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/branches/1.0.0
</developerConnection>
- <url>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0.0-SP1</url>
+ <url>https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0.0</url>
</scm>
<profiles>
16 years, 5 months
Weld SVN: r5040 - cdi-tck/tags.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-13 11:26:09 -0500 (Fri, 13 Nov 2009)
New Revision: 5040
Added:
cdi-tck/tags/1.0.0-SP1/
Log:
[maven-scm] copy for tag 1.0.0-SP1
Copied: cdi-tck/tags/1.0.0-SP1 (from rev 5039, cdi-tck/branches/1.0.0)
16 years, 5 months