October 2009 - weld-commits - Jboss List Archives

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-14 11:37:27 -0400 (Wed, 14 Oct 2009) New Revision: 4060 Added: extensions/tags/1.0.0-CR1/ Log: [maven-scm] copy for tag 1.0.0-CR1 Copied: extensions/tags/1.0.0-CR1 (from rev 4059, extensions/trunk)

15 years

1
0
0 / 0

Weld SVN: r4059 - in extensions/trunk: bom and 9 other directories.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-14 11:36:47 -0400 (Wed, 14 Oct 2009) New Revision: 4059 Modified: extensions/trunk/bom/pom.xml extensions/trunk/logger/pom.xml extensions/trunk/parent/pom.xml extensions/trunk/pom.xml extensions/trunk/se/pom.xml extensions/trunk/servlet/build/pom.xml extensions/trunk/servlet/int/pom.xml extensions/trunk/servlet/pom.xml extensions/trunk/servlet/support/pom.xml extensions/trunk/servlet/tests/pom.xml extensions/trunk/wicket/pom.xml Log: [maven-release-plugin] prepare release 1.0.0-CR1 Modified: extensions/trunk/bom/pom.xml =================================================================== --- extensions/trunk/bom/pom.xml 2009-10-14 15:36:11 UTC (rev 4058) +++ extensions/trunk/bom/pom.xml 2009-10-14 15:36:47 UTC (rev 4059) @@ -1,10 +1,9 @@ -<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"> +<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-extensions-bom</artifactId> <packaging>pom</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-CR1</version> <parent> <groupId>org.jboss.weld</groupId> @@ -169,4 +168,10 @@ </dependencies> </dependencyManagement> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/extensions/tags/1.0.0-CR1</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/extensions/tags/1.0.0-CR1</developerConnection> + <url>http://fisheye.jboss.org/browse/Weld/extensions/tags/1.0.0-CR1/build/tags...</url> + </scm> </project> Modified: extensions/trunk/logger/pom.xml =================================================================== --- extensions/trunk/logger/pom.xml 2009-10-14 15:36:11 UTC (rev 4058) +++ extensions/trunk/logger/pom.xml 2009-10-14 15:36:47 UTC (rev 4059) @@ -2,8 +2,8 @@ <parent> <artifactId>weld-extensions-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-SNAPSHOT</version> - <relativePath>../parent</relativePath> + <version>1.0.0-CR1</version> + <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.weld</groupId> Modified: extensions/trunk/parent/pom.xml =================================================================== --- extensions/trunk/parent/pom.xml 2009-10-14 15:36:11 UTC (rev 4058) +++ extensions/trunk/parent/pom.xml 2009-10-14 15:36:47 UTC (rev 4059) @@ -6,8 +6,8 @@ <parent> <groupId>org.jboss.weld</groupId> <artifactId>weld-extensions-bom</artifactId> - <version>1.0.0-SNAPSHOT</version> - <relativePath>../bom</relativePath> + <version>1.0.0-CR1</version> + <relativePath>../bom/pom.xml</relativePath> </parent> <name>Weld Extensions parent</name> Modified: extensions/trunk/pom.xml =================================================================== --- extensions/trunk/pom.xml 2009-10-14 15:36:11 UTC (rev 4058) +++ extensions/trunk/pom.xml 2009-10-14 15:36:47 UTC (rev 4059) @@ -3,7 +3,7 @@ <groupId>org.jboss.weld</groupId> <artifactId>weld-extensions-build-aggregator</artifactId> <packaging>pom</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-CR1</version> <parent> <groupId>org.jboss.weld</groupId> @@ -27,9 +27,9 @@  <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> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/extensions/tags/1.0.0-CR1</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/extensions/tags/1.0.0-CR1</developerConnection> + <url>scm:svn:https://svn.jboss.org/repos/weld/extensions/tags/1.0.0-CR1</url> </scm>  Modified: extensions/trunk/se/pom.xml =================================================================== --- extensions/trunk/se/pom.xml 2009-10-14 15:36:11 UTC (rev 4058) +++ extensions/trunk/se/pom.xml 2009-10-14 15:36:47 UTC (rev 4059) @@ -1,10 +1,10 @@ <?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"> +<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-extensions-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-CR1</version> + <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.weld</groupId> Modified: extensions/trunk/servlet/build/pom.xml =================================================================== --- extensions/trunk/servlet/build/pom.xml 2009-10-14 15:36:11 UTC (rev 4058) +++ extensions/trunk/servlet/build/pom.xml 2009-10-14 15:36:47 UTC (rev 4059) @@ -3,12 +3,12 @@ <parent> <artifactId>weld-servlet-parent</artifactId> <groupId>org.jboss.weld.servlet</groupId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.weld.servlet</groupId> <artifactId>weld-servlet</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-CR1</version> <packaging>jar</packaging> <name>Weld Servlet module</name> <url>http://www.seamframework.org/Weld</url> Modified: extensions/trunk/servlet/int/pom.xml =================================================================== --- extensions/trunk/servlet/int/pom.xml 2009-10-14 15:36:11 UTC (rev 4058) +++ extensions/trunk/servlet/int/pom.xml 2009-10-14 15:36:47 UTC (rev 4059) @@ -3,12 +3,12 @@ <parent> <artifactId>weld-servlet-parent</artifactId> <groupId>org.jboss.weld.servlet</groupId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.weld.servlet</groupId> <artifactId>weld-servlet-int</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-CR1</version> <packaging>jar</packaging> <name>Weld Servlet Integration</name> <url>http://www.seamframework.org/Weld</url> Modified: extensions/trunk/servlet/pom.xml =================================================================== --- extensions/trunk/servlet/pom.xml 2009-10-14 15:36:11 UTC (rev 4058) +++ extensions/trunk/servlet/pom.xml 2009-10-14 15:36:47 UTC (rev 4059) @@ -7,7 +7,8 @@ <parent> <groupId>org.jboss.weld</groupId> <artifactId>weld-extensions-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-CR1</version> + <relativePath>../parent/pom.xml</relativePath> </parent> <name>Weld Servlet support build aggregator</name> Modified: extensions/trunk/servlet/support/pom.xml =================================================================== --- extensions/trunk/servlet/support/pom.xml 2009-10-14 15:36:11 UTC (rev 4058) +++ extensions/trunk/servlet/support/pom.xml 2009-10-14 15:36:47 UTC (rev 4059) @@ -3,12 +3,12 @@ <parent> <artifactId>weld-servlet-parent</artifactId> <groupId>org.jboss.weld.servlet</groupId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.weld.servlet</groupId> <artifactId>weld-tomcat-support</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-CR1</version> <packaging>jar</packaging> <name>Weld Servlet Integration: Tomcat Support</name> <url>http://www.seamframework.org/Weld</url> Modified: extensions/trunk/servlet/tests/pom.xml =================================================================== --- extensions/trunk/servlet/tests/pom.xml 2009-10-14 15:36:11 UTC (rev 4058) +++ extensions/trunk/servlet/tests/pom.xml 2009-10-14 15:36:47 UTC (rev 4059) @@ -3,7 +3,7 @@ <parent> <artifactId>weld-servlet-parent</artifactId> <groupId>org.jboss.weld.servlet</groupId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.weld.servlet</groupId> Modified: extensions/trunk/wicket/pom.xml =================================================================== --- extensions/trunk/wicket/pom.xml 2009-10-14 15:36:11 UTC (rev 4058) +++ extensions/trunk/wicket/pom.xml 2009-10-14 15:36:47 UTC (rev 4059) @@ -1,9 +1,9 @@ -<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"> +<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> <groupId>org.jboss.weld</groupId> <artifactId>weld-extensions-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-CR1</version> + <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.weld</groupId>

15 years

1
0
0 / 0

Weld SVN: r4058 - build/trunk/dist.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-14 11:36:11 -0400 (Wed, 14 Oct 2009) New Revision: 4058 Modified: build/trunk/dist/build.xml Log: ws Modified: build/trunk/dist/build.xml =================================================================== --- build/trunk/dist/build.xml 2009-10-14 15:31:10 UTC (rev 4057) +++ build/trunk/dist/build.xml 2009-10-14 15:36:11 UTC (rev 4058) @@ -2,21 +2,21 @@ <project name="DistributionBuilder" default="dist" basedir="." xmlns:artifact="urn:maven-artifact-ant"> <property name="weld.dir" location="${ant.file.DistributionBuilder}/../../" /> - - <path id="maven-ant-tasks.classpath" path="${weld.dir}/lib/maven-ant-tasks.jar" /> - <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" /> - + + <path id="maven-ant-tasks.classpath" path="${weld.dir}/lib/maven-ant-tasks.jar" /> + <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" /> + <property file="versions.properties" /> - - <property name="maven.dir" location="${weld.dir}/lib/maven" /> - + + <property name="maven.dir" location="${weld.dir}/lib/maven" /> + <property name="dist.dir" value="${weld.dir}/dist/weld-${weld.version}" /> <property name="dist.wb.lib.dir" value="${dist.dir}/lib/weld" /> <property name="dist.doc.dir" value="${dist.dir}/doc" /> <property name="dist.apidocs.dir" value="${dist.dir}/doc/apidocs" /> - + <target name="dist" description="Build the distribution"> - + <fail unless="weld.version" message="You must specify the weld.version as a property" /> <fail unless="jsr299.version" message="You must specify the jsr299.version as a property" /> <fail unless="weld.servlet.version" message="You must specify the weld.servlet.version as a property" /> @@ -25,98 +25,98 @@ <fail unless="weld.logger.version" message="You must specify the weld.logger.version as a property" /> <fail unless="refdoc.dir" message="You must specify the reference docs directory with -Drefdoc.dir=~/workspace/wb/reference" /> <fail unless="examples.dir" message="You must specify the examples directory with -Dexamples.dir=~/workspace/wb/examples" /> - + <maven target="clean" basedir="${weld.dir}" /> <maven target="clean" basedir="${refdoc.dir}" /> <maven target="clean" basedir="${examples.dir}" /> <delete dir="${weld.dir}/jboss-as/target" /> <delete dir="${weld.dir}/impl/test-output" /> <delete dir="${weld.dir}/impl/ObjectStore" /> - <delete dir="${dist.dir}" failonerror="false"/> - <mkdir dir="${dist.dir}"/> + <delete dir="${dist.dir}" failonerror="false" /> + <mkdir dir="${dist.dir}" /> <copy todir="${dist.dir}"> - <fileset dir="${weld.dir}"> - <include name="jboss-as/**"/> - <include name="lib/**"/> - <include name="readme.txt"/> - </fileset> + <fileset dir="${weld.dir}"> + <include name="jboss-as/**" /> + <include name="lib/**" /> + <include name="readme.txt" /> + </fileset> <fileset dir="${basedir}"> - <include name="readme.txt"/> + <include name="readme.txt" /> </fileset> - </copy> - - <mkdir dir="${dist.dir}/examples"/> + </copy> + + <mkdir dir="${dist.dir}/examples" /> <copy todir="${dist.dir}/examples"> <fileset dir="${examples.dir}" /> </copy> - + <maven target="jdocbook:translate compile" basedir="${refdoc.dir}" /> <mkdir dir="${dist.doc.dir}" /> <copy todir="${dist.doc.dir}"> <fileset dir="${refdoc.dir}/target/docbook/publish"> - <include name="de-DE/**/*"/> - <include name="en-US/**/*"/> - <include name="es-ES/**/*"/> - <include name="ko-KR/**/*"/> - <include name="it-IT/**/*"/> - <include name="pt-BR/**/*"/> - <include name="zh-CN/**/*"/> - <include name="zh-TW/**/*"/> + <include name="de-DE/**/*" /> + <include name="en-US/**/*" /> + <include name="es-ES/**/*" /> + <include name="ko-KR/**/*" /> + <include name="it-IT/**/*" /> + <include name="pt-BR/**/*" /> + <include name="zh-CN/**/*" /> + <include name="zh-TW/**/*" /> </fileset> </copy> <maven target="clean" basedir="${refdoc.dir}" /> - + <artifact:dependencies filesetId="weld.fileset" versionsId="weld.versions" sourcesfilesetid="weld.sources.fileset" javadocfilesetid="weld.javadocs.fileset"> - <dependency groupId="org.jboss.weld" artifactId="jsr299-api" version="${jsr299.version}"/> - <dependency groupId="org.jboss.weld" artifactId="weld-core" version="${weld.version}"/> - <dependency groupId="org.jboss.weld" artifactId="weld-spi" version="${weld.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}"/> - <remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" /> + <dependency groupId="org.jboss.weld" artifactId="jsr299-api" version="${jsr299.version}" /> + <dependency groupId="org.jboss.weld" artifactId="weld-core" version="${weld.version}" /> + <dependency groupId="org.jboss.weld" artifactId="weld-spi" version="${weld.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}" /> + <remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" /> </artifact:dependencies> - - <delete dir="target" failonerror="false"/> + + <delete dir="target" failonerror="false" /> <mkdir dir="target" /> - <copy todir="target"> - <fileset refid="weld.fileset"/> - <fileset refid="weld.sources.fileset"/> - <fileset refid="weld.javadocs.fileset"/> - <chainedmapper> - <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${weld.versions}" to="flatten" /> - <flattenmapper /> - </chainedmapper> - </copy> - - <mkdir dir="${dist.apidocs.dir}"/> + <copy todir="target"> + <fileset refid="weld.fileset" /> + <fileset refid="weld.sources.fileset" /> + <fileset refid="weld.javadocs.fileset" /> + <chainedmapper> + <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${weld.versions}" to="flatten" /> + <flattenmapper /> + </chainedmapper> + </copy> + + <mkdir dir="${dist.apidocs.dir}" /> <unzip dest="${dist.apidocs.dir}"> - <fileset dir="target"> - <include name="jsr299-api-javadoc.jar"/> - <include name="weld-api-javadoc.jar"/> - </fileset> + <fileset dir="target"> + <include name="jsr299-api-javadoc.jar" /> + <include name="weld-api-javadoc.jar" /> + </fileset> </unzip> - + <mkdir dir="${dist.wb.lib.dir}" /> - - <copy todir="${dist.wb.lib.dir}"> - <fileset dir="target"> - <include name="weld-*.jar" /> - <include name="jsr299-api*.jar" /> - </fileset> - </copy> - <delete dir="target" failonerror="false"/> - + + <copy todir="${dist.wb.lib.dir}"> + <fileset dir="target"> + <include name="weld-*.jar" /> + <include name="jsr299-api*.jar" /> + </fileset> + </copy> + <delete dir="target" failonerror="false" /> + <zip destfile="weld-${weld.version}.zip"> - <fileset dir="${weld.dir}/dist"> - <include name="weld-${weld.version}/**" /> - </fileset> - </zip> + <fileset dir="${weld.dir}/dist"> + <include name="weld-${weld.version}/**" /> + </fileset> + </zip> </target> - + <target name="deploy-dist" depends="dist"> <maven target="deploy:deploy-file" basedir="${weld.dir}"> <arg line="-DpomFile=${basedir}/pom.xml" /> @@ -128,28 +128,28 @@ <arg line="-DuniqueVersion=false" /> </maven> </target> - - <macrodef name="maven"> - <attribute name="target" /> - <attribute name="basedir" /> - <element name="args" implicit="true" optional="true" /> - <sequential> - <java classname="org.codehaus.classworlds.Launcher" fork="true" dir="@{basedir}" maxmemory="512m" failonerror="true"> - <classpath> - <fileset dir="${maven.dir}/boot"> - <include name="*.jar" /> - </fileset> - <fileset dir="${maven.dir}/bin"> - <include name="*.*" /> - </fileset> - </classpath> - <jvmarg line="-Xms128m -Xmx512m -XX:MaxPermSize=128m"/> - <sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" /> - <sysproperty key="maven.home" value="${maven.dir}" /> - <args /> - <arg line="@{target}" /> - </java> - </sequential> - </macrodef> - + + <macrodef name="maven"> + <attribute name="target" /> + <attribute name="basedir" /> + <element name="args" implicit="true" optional="true" /> + <sequential> + <java classname="org.codehaus.classworlds.Launcher" fork="true" dir="@{basedir}" maxmemory="512m" failonerror="true"> + <classpath> + <fileset dir="${maven.dir}/boot"> + <include name="*.jar" /> + </fileset> + <fileset dir="${maven.dir}/bin"> + <include name="*.*" /> + </fileset> + </classpath> + <jvmarg line="-Xms128m -Xmx512m -XX:MaxPermSize=128m" /> + <sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" /> + <sysproperty key="maven.home" value="${maven.dir}" /> + <args /> + <arg line="@{target}" /> + </java> + </sequential> + </macrodef> + </project>

15 years

1
0
0 / 0

Weld SVN: r4057 - extensions/trunk/servlet/tests.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-14 11:31:10 -0400 (Wed, 14 Oct 2009) New Revision: 4057 Modified: extensions/trunk/servlet/tests/pom.xml Log: non-snapshot deps Modified: extensions/trunk/servlet/tests/pom.xml =================================================================== --- extensions/trunk/servlet/tests/pom.xml 2009-10-14 15:29:19 UTC (rev 4056) +++ extensions/trunk/servlet/tests/pom.xml 2009-10-14 15:31:10 UTC (rev 4057) @@ -8,7 +8,6 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.weld.servlet</groupId> <artifactId>weld-servlet-test</artifactId> - <version>1.0.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Weld Servlet Integration Tests</name> <url>http://www.seamframework.org/Weld</url> @@ -57,7 +56,6 @@ <groupId>org.jboss.weld</groupId> <artifactId>weld-core-test</artifactId> <scope>test</scope> - <version>1.0.0-SNAPSHOT</version>  </dependency> <dependency> @@ -87,7 +85,6 @@ <groupId>org.jboss.weld.servlet</groupId> <artifactId>weld-servlet-int</artifactId> <scope>test</scope> - <version>1.0.0-SNAPSHOT</version>  </dependency> <dependency>

15 years

1
0
0 / 0

Weld SVN: r4056 - in extensions/trunk: servlet/build and 1 other directory.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-14 11:29:19 -0400 (Wed, 14 Oct 2009) New Revision: 4056 Modified: extensions/trunk/bom/pom.xml extensions/trunk/servlet/build/pom.xml Log: non-snapshot deps Modified: extensions/trunk/bom/pom.xml =================================================================== --- extensions/trunk/bom/pom.xml 2009-10-14 15:26:32 UTC (rev 4055) +++ extensions/trunk/bom/pom.xml 2009-10-14 15:29:19 UTC (rev 4056) @@ -137,6 +137,12 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.jboss.weld.servlet</groupId> + <artifactId>weld-servlet-int</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>catalina</artifactId> <version>${tomcat.version}</version> Modified: extensions/trunk/servlet/build/pom.xml =================================================================== --- extensions/trunk/servlet/build/pom.xml 2009-10-14 15:26:32 UTC (rev 4055) +++ extensions/trunk/servlet/build/pom.xml 2009-10-14 15:29:19 UTC (rev 4056) @@ -19,14 +19,12 @@ <groupId>org.jboss.weld.servlet</groupId> <artifactId>weld-servlet-int</artifactId> <optional>true</optional> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.jboss.weld</groupId> <artifactId>weld-core</artifactId> <optional>true</optional> - <version>1.0.0-SNAPSHOT</version> </dependency> <dependency>

15 years

1
0
0 / 0

Weld SVN: r4055 - in extensions/trunk: parent and 1 other directory.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-14 11:26:32 -0400 (Wed, 14 Oct 2009) New Revision: 4055 Modified: extensions/trunk/bom/pom.xml extensions/trunk/parent/pom.xml Log: non-snapshot deps Modified: extensions/trunk/bom/pom.xml =================================================================== --- extensions/trunk/bom/pom.xml 2009-10-14 15:23:09 UTC (rev 4054) +++ extensions/trunk/bom/pom.xml 2009-10-14 15:26:32 UTC (rev 4055) @@ -38,7 +38,7 @@  <jsf.version>2.0.0-RC</jsf.version> <wicket.version>1.4.1</wicket.version> - <jboss.test.harness.version>1.1.0-SNAPSHOT</jboss.test.harness.version> + <jboss.test.harness.version>1.1.0-CR1</jboss.test.harness.version> <tomcat.version>6.0.20</tomcat.version> <uel.glassfish.version>2.1.2-b04</uel.glassfish.version> <log4j.version>1.2.14</log4j.version> Modified: extensions/trunk/parent/pom.xml =================================================================== --- extensions/trunk/parent/pom.xml 2009-10-14 15:23:09 UTC (rev 4054) +++ extensions/trunk/parent/pom.xml 2009-10-14 15:26:32 UTC (rev 4055) @@ -55,7 +55,7 @@ <properties>  <testng.version>5.9</testng.version> - <jboss.test.harness.version>1.1.0-SNAPSHOT</jboss.test.harness.version> + <jboss.test.harness.version>1.1.0-CR1</jboss.test.harness.version> <apache.httpclient.version>3.1</apache.httpclient.version> <junit.version>4.7</junit.version> <htmlunit.version>2.4</htmlunit.version>

15 years

1
0
0 / 0

Weld SVN: r4054 - core/trunk and 1 other directory.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-14 11:23:09 -0400 (Wed, 14 Oct 2009) New Revision: 4054 Added: build/trunk/dist/ Removed: core/trunk/dist/ Log: move dist Copied: build/trunk/dist (from rev 4053, core/trunk/dist)

15 years

1
0
0 / 0

Weld SVN: r4053 - in cdi-tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual and 3 other directories.

by weld-commits＠lists.jboss.org

Author: jharting Date: 2009-10-14 11:10:47 -0400 (Wed, 14 Oct 2009) New Revision: 4053 Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/ProcessInjectionTargetEventObserver.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/ProcessInjectionTargetEventTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ProcessInjectionTargetEventObserver.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ProcessInjectionTargetEventTest.java cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/javax.enterprise.inject.spi.Extension cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/javax.enterprise.inject.spi.Extension Log: CDITCK-4 Tests for section 11.5.6 Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/ProcessInjectionTargetEventObserver.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/ProcessInjectionTargetEventObserver.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/ProcessInjectionTargetEventObserver.java 2009-10-14 15:10:47 UTC (rev 4053) @@ -0,0 +1,30 @@ +package org.jboss.jsr299.tck.tests.lookup.injection.enterprise; + +import javax.enterprise.event.Observes; +import javax.enterprise.inject.spi.Extension; +import javax.enterprise.inject.spi.ProcessInjectionTarget; + +public class ProcessInjectionTargetEventObserver implements Extension +{ + + private static ProcessInjectionTarget<Farm> sessionBeanEvent = null; + private static ProcessInjectionTarget<FarmInterceptor> ejbInterceptorEvent = null; + + public void observeSessionBean(@Observes ProcessInjectionTarget<Farm> event) { + sessionBeanEvent = event; + } + + public void observeEJBInterceptor(@Observes ProcessInjectionTarget<FarmInterceptor> event) { + ejbInterceptorEvent = event; + } + + public static ProcessInjectionTarget<Farm> getSessionBeanEvent() + { + return sessionBeanEvent; + } + + public static ProcessInjectionTarget<FarmInterceptor> getEjbInterceptorEvent() + { + return ejbInterceptorEvent; + } +} Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/ProcessInjectionTargetEventTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/ProcessInjectionTargetEventTest.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/ProcessInjectionTargetEventTest.java 2009-10-14 15:10:47 UTC (rev 4053) @@ -0,0 +1,65 @@ +/* + * 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.jsr299.tck.tests.lookup.injection.enterprise; + +import javax.enterprise.inject.spi.ProcessInjectionTarget; + +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Resource; +import org.testng.annotations.Test; + +/** + * This test verifies that ProcessInjectionTarget event is fired for a session bean and EJB interceptor. + * @author Jozef Hartinger + * + */ + +@Artifact +@Resource(source = "javax.enterprise.inject.spi.Extension", destination = "WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") +@IntegrationTest +@SpecVersion(spec = "cdi", version = "PFD2") +public class ProcessInjectionTargetEventTest extends AbstractJSR299Test +{ + @Test(groups = "ri-broken") + @SpecAssertions({ + @SpecAssertion(section = "11.5.6", id = "aab"), + @SpecAssertion(section = "11.5.6", id = "abb")}) + public void testEventFiredForSessionBean() + { + ProcessInjectionTarget<Farm> event = ProcessInjectionTargetEventObserver.getSessionBeanEvent(); + assert event != null; + assert event.getAnnotatedType().getBaseType().equals(Farm.class); + assert event.getAnnotatedType().getFields().size() == 2; + } + + @Test + @SpecAssertions({ + @SpecAssertion(section = "11.5.6", id = "aaf"), + @SpecAssertion(section = "11.5.6", id = "abf")}) + public void testEventFiredForTagHandler() + { + ProcessInjectionTarget<FarmInterceptor> event = ProcessInjectionTargetEventObserver.getEjbInterceptorEvent(); + assert event != null; + assert event.getAnnotatedType().getBaseType().equals(FarmInterceptor.class); + assert event.getAnnotatedType().getFields().size() == 1; + } +} Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ProcessInjectionTargetEventObserver.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ProcessInjectionTargetEventObserver.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ProcessInjectionTargetEventObserver.java 2009-10-14 15:10:47 UTC (rev 4053) @@ -0,0 +1,65 @@ +package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual; + +import javax.enterprise.event.Observes; +import javax.enterprise.inject.spi.Extension; +import javax.enterprise.inject.spi.ProcessAnnotatedType; +import javax.enterprise.inject.spi.ProcessInjectionTarget; +import javax.servlet.Filter; +import javax.servlet.Servlet; +import javax.servlet.ServletContextListener; +import javax.servlet.jsp.tagext.SimpleTag; + +public class ProcessInjectionTargetEventObserver implements Extension +{ + + private static ProcessInjectionTarget<Servlet> servletEvent = null; + private static ProcessInjectionTarget<ServletContextListener> listenerEvent = null; + private static ProcessInjectionTarget<Filter> filterEvent = null; + private static ProcessInjectionTarget<ServletContextListener> tagLibraryListenerEvent = null; + private static ProcessInjectionTarget<SimpleTag> tagHandlerEvent = null; + + public void observeServlet(@Observes ProcessInjectionTarget<Servlet> event) { + servletEvent = event; + } + + public void observeFilter(@Observes ProcessInjectionTarget<Filter> event) { + filterEvent = event; + } + + public void observeListener(@Observes ProcessInjectionTarget<ServletContextListener> event) { + listenerEvent = event; + } + + public void observeTagHandler(@Observes ProcessInjectionTarget<SimpleTag> event) { + tagHandlerEvent = event; + } + + public void observeTagLibraryListener(@Observes ProcessInjectionTarget<ServletContextListener> event) { + tagLibraryListenerEvent = event; + } + + public static ProcessInjectionTarget<Servlet> getServletEvent() + { + return servletEvent; + } + + public static ProcessInjectionTarget<ServletContextListener> getListenerEvent() + { + return listenerEvent; + } + + public static ProcessInjectionTarget<Filter> getFilterEvent() + { + return filterEvent; + } + + public static ProcessInjectionTarget<ServletContextListener> getTagLibraryListenerEvent() + { + return tagLibraryListenerEvent; + } + + public static ProcessInjectionTarget<SimpleTag> getTagHandlerEvent() + { + return tagHandlerEvent; + } +} Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ProcessInjectionTargetEventTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ProcessInjectionTargetEventTest.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ProcessInjectionTargetEventTest.java 2009-10-14 15:10:47 UTC (rev 4053) @@ -0,0 +1,101 @@ +/* + * 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.jsr299.tck.tests.lookup.injection.non.contextual; + +import javax.enterprise.inject.spi.ProcessInjectionTarget; +import javax.servlet.Filter; +import javax.servlet.Servlet; +import javax.servlet.ServletContextListener; +import javax.servlet.jsp.tagext.SimpleTag; + +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Resource; +import org.jboss.testharness.impl.packaging.Resources; +import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.testng.annotations.Test; + +@Artifact +@Resources( { @Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml"), + @Resource(destination = "WEB-INF/faces-config.xml", source = "faces-config.xml"), + @Resource(destination = "WEB-INF/TestLibrary.tld", source = "TestLibrary.tld"), + @Resource(destination = "TagPage.jsp", source = "TagPage.jsp"), + @Resource(destination = "ManagedBeanTestPage.jsp", source = "ManagedBeanTestPage.jsp"), + @Resource(source = "javax.enterprise.inject.spi.Extension", destination = "WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") }) +@IntegrationTest +@SpecVersion(spec = "cdi", version = "PFD2") +public class ProcessInjectionTargetEventTest extends AbstractJSR299Test +{ + @Test(groups = "ri-broken") + @SpecAssertions({ + @SpecAssertion(section = "11.5.6", id = "aac"), + @SpecAssertion(section = "11.5.6", id = "abc")}) + public void testEventFiredForServletListener() + { + ProcessInjectionTarget<ServletContextListener> event = ProcessInjectionTargetEventObserver.getListenerEvent(); + assert event != null; + assert event.getAnnotatedType().getBaseType().equals(TestListener.class); + } + + @Test + @SpecAssertions({ + @SpecAssertion(section = "11.5.6", id = "aad"), + @SpecAssertion(section = "11.5.6", id = "abd")}) + public void testEventFiredForTagHandler() + { + ProcessInjectionTarget<SimpleTag> event = ProcessInjectionTargetEventObserver.getTagHandlerEvent(); + assert event != null; + assert event.getAnnotatedType().getBaseType().equals(TestTagHandler.class); + } + + @Test(groups = "ri-broken") + @SpecAssertions({ + @SpecAssertion(section = "11.5.6", id = "aae"), + @SpecAssertion(section = "11.5.6", id = "abe")}) + public void testEventFiredForTagLibraryListener() + { + ProcessInjectionTarget<ServletContextListener> event = ProcessInjectionTargetEventObserver.getTagLibraryListenerEvent(); + assert event != null; + assert event.getAnnotatedType().getBaseType().equals(TagLibraryListener.class); + } + + @Test(groups = "ri-broken") + @SpecAssertions({ + @SpecAssertion(section = "11.5.6", id = "aah"), + @SpecAssertion(section = "11.5.6", id = "abh")}) + public void testEventFiredForServlet() + { + ProcessInjectionTarget<Servlet> event = ProcessInjectionTargetEventObserver.getServletEvent(); + assert event != null; + assert event.getAnnotatedType().getBaseType().equals(TestServlet.class); + } + + @Test(groups = "ri-broken") + @SpecAssertions({ + @SpecAssertion(section = "11.5.6", id = "aai"), + @SpecAssertion(section = "11.5.6", id = "abi")}) + public void testEventFiredForFilter() + { + ProcessInjectionTarget<Filter> event = ProcessInjectionTargetEventObserver.getFilterEvent(); + assert event != null; + assert event.getAnnotatedType().getBaseType().equals(TestFilter.class); + } +} Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/javax.enterprise.inject.spi.Extension =================================================================== --- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/javax.enterprise.inject.spi.Extension (rev 0) +++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/javax.enterprise.inject.spi.Extension 2009-10-14 15:10:47 UTC (rev 4053) @@ -0,0 +1 @@ +org.jboss.jsr299.tck.tests.lookup.injection.enterprise.ProcessInjectionTargetEventObserver \ No newline at end of file Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/javax.enterprise.inject.spi.Extension =================================================================== --- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/javax.enterprise.inject.spi.Extension (rev 0) +++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/javax.enterprise.inject.spi.Extension 2009-10-14 15:10:47 UTC (rev 4053) @@ -0,0 +1 @@ +org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ProcessInjectionTargetEventObserver \ No newline at end of file

15 years

1
0
0 / 0

Weld SVN: r4052 - in extensions/trunk: se and 1 other directory.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-14 10:52:53 -0400 (Wed, 14 Oct 2009) New Revision: 4052 Modified: extensions/trunk/bean-utils/pom.xml extensions/trunk/se/pom.xml Log: workaround WELD-203 Modified: extensions/trunk/bean-utils/pom.xml =================================================================== --- extensions/trunk/bean-utils/pom.xml 2009-10-14 14:45:55 UTC (rev 4051) +++ extensions/trunk/bean-utils/pom.xml 2009-10-14 14:52:53 UTC (rev 4052) @@ -1,6 +1,6 @@ <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-parent</artifactId> + <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> <version>1.0.0-SNAPSHOT</version> </parent> Modified: extensions/trunk/se/pom.xml =================================================================== --- extensions/trunk/se/pom.xml 2009-10-14 14:45:55 UTC (rev 4051) +++ extensions/trunk/se/pom.xml 2009-10-14 14:52:53 UTC (rev 4052) @@ -71,6 +71,12 @@ <groupId>javax.el</groupId> <artifactId>el-api</artifactId> </dependency> + +  + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </dependency> </dependencies>

15 years

1
0
0 / 0

Weld SVN: r4051 - in core/trunk: bom and 8 other directories.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-14 10:45:55 -0400 (Wed, 14 Oct 2009) New Revision: 4051 Modified: core/trunk/ core/trunk/bom/ core/trunk/impl/ core/trunk/inject-tck-runner/ core/trunk/jboss-tck-runner/ core/trunk/logging/ core/trunk/osgi-bundle/ core/trunk/parent/ core/trunk/porting-package/ core/trunk/tests/ Log: ignores Property changes on: core/trunk ___________________________________________________________________ Name: svn:ignore - .classpath .settings .project tests target + target .settings .project .classpath bin pom.xml.releaseBackup release.properties Property changes on: core/trunk/bom ___________________________________________________________________ Name: svn:ignore - target .settings .project .classpath bin + target .settings .project .classpath bin pom.xml.releaseBackup Property changes on: core/trunk/impl ___________________________________________________________________ Name: svn:ignore - cobertura.ser nb-configuration.xml test-output .classpath .project target temp-testng-customsuite.xml ObjectStore .settings + cobertura.ser nb-configuration.xml test-output .classpath .project target temp-testng-customsuite.xml ObjectStore .settings pom.xml.releaseBackup Property changes on: core/trunk/inject-tck-runner ___________________________________________________________________ Name: svn:ignore - .settings target .project test-output .classpath bin temp-testng-customsuite.xml + .settings target .project test-output .classpath bin temp-testng-customsuite.xml pom.xml.releaseBackup Property changes on: core/trunk/jboss-tck-runner ___________________________________________________________________ Name: svn:ignore - .classpath target .project .settings + .classpath target .project .settings pom.xml.releaseBackup Property changes on: core/trunk/logging ___________________________________________________________________ Name: svn:ignore - .project .classpath target .settings test-output + .project .classpath target .settings test-output pom.xml.releaseBackup Property changes on: core/trunk/osgi-bundle ___________________________________________________________________ Name: svn:ignore - .settings target .project test-output .classpath bin + .settings target .project test-output .classpath bin pom.xml.releaseBackup Property changes on: core/trunk/parent ___________________________________________________________________ Name: svn:ignore - target .settings .project .classpath bin + target .settings .project .classpath bin pom.xml.releaseBackup Property changes on: core/trunk/porting-package ___________________________________________________________________ Name: svn:ignore - .settings target .project .classpath + .settings target .project .classpath pom.xml.releaseBackup Property changes on: core/trunk/tests ___________________________________________________________________ Name: svn:ignore - .project .classpath .settings target temp-testng-customsuite.xml test-output bin + .project .classpath .settings target temp-testng-customsuite.xml test-output bin pom.xml.releaseBackup

15 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits October 2009