October 2009 - weld-commits - Jboss List Archives

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-12 11:51:07 -0400 (Mon, 12 Oct 2009) New Revision: 3959 Modified: cdi-tck/trunk/pom.xml Log: cleanup Modified: cdi-tck/trunk/pom.xml =================================================================== --- cdi-tck/trunk/pom.xml 2009-10-12 15:41:43 UTC (rev 3958) +++ cdi-tck/trunk/pom.xml 2009-10-12 15:51:07 UTC (rev 3959) @@ -44,6 +44,11 @@ <organization>Red Hat Inc.</organization> </developer> </developers> + + <organization> + <name>Seam Framework</name> + <url>http://seamframework.org</url> + </organization> <ciManagement> <system>Hudson</system> @@ -73,7 +78,7 @@ <jsr299.tck.version>${project.version}</jsr299.tck.version> <jboss.test.audit.version>1.1.0-SNAPSHOT</jboss.test.audit.version> <jboss.test.harness.version>1.1.0-SNAPSHOT</jboss.test.harness.version> - <testng.version>5.8</testng.version> + <testng.version>5.9</testng.version> <jsr250.api.version>1.0</jsr250.api.version> <cdi.api.version>1.0-SNAPSHOT</cdi.api.version> <atinject.api.version>1.0-PFD-1</atinject.api.version> @@ -315,17 +320,4 @@ <url>http://fisheye.jboss.org/browse/Weld</url> </scm> - <distributionManagement> - <repository> - <id>oss.sonatype.org/jboss-staging</id> - <name>Sonatype Nexus Maven Repository</name> - <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url> - </repository> - <snapshotRepository> - <id>oss.sonatype.org/jboss-snapshots</id> - <name>Sonatype Nexus Snapshot Repository</name> - <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url> - </snapshotRepository> - </distributionManagement> - </project>

15 years, 2 months

1
0
0 / 0

Weld SVN: r3958 - api/trunk/bom.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-12 11:41:43 -0400 (Mon, 12 Oct 2009) New Revision: 3958 Modified: api/trunk/bom/pom.xml Log: remove wicket Modified: api/trunk/bom/pom.xml =================================================================== --- api/trunk/bom/pom.xml 2009-10-12 14:57:04 UTC (rev 3957) +++ api/trunk/bom/pom.xml 2009-10-12 15:41:43 UTC (rev 3958) @@ -95,12 +95,6 @@ <dependencies> <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket</artifactId> - <version>${wicket.version}</version> - </dependency> - - <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> <version>${jsr250.api.version}</version>

15 years, 2 months

1
0
0 / 0

Weld SVN: r3957 - build/trunk/parent.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-12 10:57:04 -0400 (Mon, 12 Oct 2009) New Revision: 3957 Modified: build/trunk/parent/pom.xml Log: add various plugins Modified: build/trunk/parent/pom.xml =================================================================== --- build/trunk/parent/pom.xml 2009-10-12 14:41:53 UTC (rev 3956) +++ build/trunk/parent/pom.xml 2009-10-12 14:57:04 UTC (rev 3957) @@ -47,6 +47,21 @@ </pluginRepository> </pluginRepositories> + <repositories> + <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>  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -85,6 +100,7 @@ <artifactId>maven-release-plugin</artifactId> <configuration> <arguments>-Prelease</arguments> + <autoVersionSubmodules>true</autoVersionSubmodules> </configuration> <version>2.0-beta-9</version> </plugin>

15 years, 2 months

1
0
0 / 0

Weld SVN: r3956 - in examples/trunk: jsf/numberguess and 1 other directories.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-12 10:41:53 -0400 (Mon, 12 Oct 2009) New Revision: 3956 Modified: examples/trunk/jsf/numberguess/pom.xml examples/trunk/jsf/translator/ejb/pom.xml examples/trunk/pom.xml Log: switch to new structure build Modified: examples/trunk/jsf/numberguess/pom.xml =================================================================== --- examples/trunk/jsf/numberguess/pom.xml 2009-10-12 14:41:46 UTC (rev 3955) +++ examples/trunk/jsf/numberguess/pom.xml 2009-10-12 14:41:53 UTC (rev 3956) @@ -54,6 +54,9 @@ <profiles> <profile> <id>jboss5</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> <dependencies> <dependency> Modified: examples/trunk/jsf/translator/ejb/pom.xml =================================================================== --- examples/trunk/jsf/translator/ejb/pom.xml 2009-10-12 14:41:46 UTC (rev 3955) +++ examples/trunk/jsf/translator/ejb/pom.xml 2009-10-12 14:41:53 UTC (rev 3956) @@ -38,8 +38,8 @@ </dependency> <dependency> - <groupId>javax.ejb</groupId> - <artifactId>ejb-api</artifactId> + <groupId>org.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-api</artifactId> <scope>provided</scope> </dependency> Modified: examples/trunk/pom.xml =================================================================== --- examples/trunk/pom.xml 2009-10-12 14:41:46 UTC (rev 3955) +++ examples/trunk/pom.xml 2009-10-12 14:41:53 UTC (rev 3956) @@ -1,10 +1,11 @@ <?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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.weld</groupId> - <artifactId>weld-version-matrix</artifactId> - <version>1.0.0-SNAPSHOT</version> + <artifactId>weld-parent</artifactId> + <version>1-SNAPSHOT</version> </parent> <groupId>org.jboss.weld.examples</groupId> <artifactId>weld-examples-parent</artifactId> @@ -13,36 +14,10 @@ <name>Weld Examples</name> <description> - Examples for the reference implementation of JSR 299: Weld + Examples for Weld, the reference implementation of JSR 299: Contexts and Dependency Injection for Java EE </description> - + <url>http://www.seamframework.org/Weld</url> - - <repositories> - <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> - <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> - </repositories> <developers> <developer> @@ -63,13 +38,44 @@ <developer> <name>David Allen</name> </developer> - + <developer> <name>Nicklas Karlsson</name> </developer> + + <developer> + <name>Clint Popetz</name> + </developer> + + <developer> + <name>Pete Royle</name> + </developer> + </developers> - - + <ciManagement> + <system>Hudson</system> + <url>http://hudson.jboss.org</url> + </ciManagement> + + <issueManagement> + <system>JIRA</system> + <url>http://jira.jboss.org/browse/WELD</url> + </issueManagement> + + <organization> + <name>Seam Framework</name> + <url>http://seamframework.org</url> + </organization> + + <inceptionYear>2008</inceptionYear> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0</url> + </license> + </licenses> + <modules> <module>jsf/numberguess</module> <module>jsf/translator</module> @@ -78,21 +84,101 @@ <module>se/hello-world</module> <module>wicket/numberguess</module> </modules> - + + <properties> + <jsf.version>2.0.0-RC</jsf.version> + <weld.api.version>1.0-SNAPSHOT</weld.api.version> + <weld.core.version>1.0.0-SNAPSHOT</weld.core.version> + <weld.extensions.version>1.0.0-SNAPSHOT</weld.extensions.version> +  + <testng.version>5.9</testng.version> + </properties> + +  + <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> + <dependencyManagement> <dependencies> - + <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> - <version>2.0.0-RC</version> + <version>${jsf.version}</version> </dependency> - + <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-impl</artifactId> - <version>2.0.0-RC</version> + <version>${jsf.version}</version> </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api-bom</artifactId> + <version>${weld.api.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-bom</artifactId> + <version>${weld.core.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-extensions-bom</artifactId> + <version>${weld.extensions.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>${testng.version}</version> + <classifier>jdk15</classifier> + </dependency> + </dependencies> </dependencyManagement> @@ -100,70 +186,19 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <phase>verify</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <tagBase>https://svn.jboss.org/repos/weld/examples/tags</tagBase> + <autoVersionSubmodules>true</autoVersionSubmodules> + </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.0-beta-8</version> - <configuration> - <tagBase>https://svn.jboss.org/repos/weld/examples/tags</tagBase> - <autoVersionSubmodules>true</autoVersionSubmodules> - </configuration> - </plugin> + </plugins> - <defaultGoal>package</defaultGoal> <pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addDefaultImplementationEntries> - true - </addDefaultImplementationEntries> - <addDefaultSpecificationEntries> - true - </addDefaultSpecificationEntries> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <configuration> - <forkMode>once</forkMode> - <metadataFile>../target/coverage.em</metadataFile> - <outputDirectory>${project.build.directory}/generated-classes</outputDirectory> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> </plugin> <plugin> @@ -176,30 +211,7 @@ </plugins> </pluginManagement> </build> - - <ciManagement> - <system>Hudson</system> - <url /> - </ciManagement> - <issueManagement> - <system>JIRA</system> - <url>http://jira.jboss.org/browse/WELD</url> - </issueManagement> - - <inceptionYear>2008</inceptionYear> - - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0</url> - </license> - <license> - <name>Lesser Gnu Public License, Version 2.1</name> - <url>http://www.gnu.org/licenses/lgpl-2.1.html</url> - </license> - </licenses> - <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/examples</connection> <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/examples</developerConnection> @@ -207,37 +219,17 @@ </scm> <distributionManagement> - <repository> - <id>repository.jboss.org</id> - <name>JBoss Releases Repository</name> - <url>dav:https://svn.jboss.org/repos/repository.jboss.org/maven2</url> + <repository> + <id>oss.sonatype.org/jboss-staging</id> + <name>JBoss (Nexus) Release Staging Repository</name> + <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url> </repository> <snapshotRepository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> + <id>oss.sonatype.org/jboss-snapshots</id> + <name>JBoss (Nexus) Snapshots Repository</name> + <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url> </snapshotRepository> </distributionManagement> - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <configuration> - <formats> - <format>html</format> - <format>xml</format> - </formats> - <instrumentation> - <ignores> - <ignore>javax.weld.*</ignore> - </ignores> - </instrumentation> - </configuration> - </plugin> - </plugins> - </reporting> - </project>

15 years, 2 months

1
0
0 / 0

Weld SVN: r3955 - build/trunk/parent.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-12 10:41:46 -0400 (Mon, 12 Oct 2009) New Revision: 3955 Modified: build/trunk/parent/pom.xml Log: add various plugins Modified: build/trunk/parent/pom.xml =================================================================== --- build/trunk/parent/pom.xml 2009-10-12 14:39:53 UTC (rev 3954) +++ build/trunk/parent/pom.xml 2009-10-12 14:41:46 UTC (rev 3955) @@ -46,6 +46,12 @@ </snapshots> </pluginRepository> </pluginRepositories> + + <properties> +  + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + </properties>  <build>

15 years, 2 months

1
0
0 / 0

Weld SVN: r3954 - build/trunk/parent.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-12 10:39:53 -0400 (Mon, 12 Oct 2009) New Revision: 3954 Modified: build/trunk/parent/pom.xml Log: add various plugins Modified: build/trunk/parent/pom.xml =================================================================== --- build/trunk/parent/pom.xml 2009-10-12 14:38:05 UTC (rev 3953) +++ build/trunk/parent/pom.xml 2009-10-12 14:39:53 UTC (rev 3954) @@ -283,6 +283,11 @@ <version>2.2</version> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <version>2.3.2</version> + </plugin> + <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>maven-jetty-plugin</artifactId> <version>6.1.21</version>

15 years, 2 months

1
0
0 / 0

Weld SVN: r3953 - build/trunk/parent.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-12 10:38:05 -0400 (Mon, 12 Oct 2009) New Revision: 3953 Modified: build/trunk/parent/pom.xml Log: add various plugins Modified: build/trunk/parent/pom.xml =================================================================== --- build/trunk/parent/pom.xml 2009-10-12 13:47:44 UTC (rev 3952) +++ build/trunk/parent/pom.xml 2009-10-12 14:38:05 UTC (rev 3953) @@ -27,9 +27,26 @@ <developer> <name>Weld committers</name> </developer> - </developers> + <organization> + <name>Seam Framework</name> + <url>http://seamframework.org</url> + </organization> + + <pluginRepositories> + <pluginRepository> + <id>twdata-m2-repository.googlecode.com</id> + <url>http://twdata-m2-repository.googlecode.com/svn</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> +  <build> <plugins> @@ -52,6 +69,8 @@ </plugins> <defaultGoal>package</defaultGoal> + +  <pluginManagement> <plugins> @@ -243,10 +262,40 @@ <timestampFormat>{0, date, long} {0, time, long}</timestampFormat> </configuration> </plugin> + <plugin> + <groupId>org.twdata.maven</groupId> + <artifactId>maven-cli-plugin</artifactId> + <version>0.6.9</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>tomcat-maven-plugin</artifactId> + <version>1.0-beta-1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>2.1-beta-1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ejb-plugin</artifactId> + <version>2.2</version> + </plugin> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> + <version>6.1.21</version> + </plugin> + <plugin> + <groupId>com.pyx4j</groupId> + <artifactId>maven-junction-plugin</artifactId> + <version>1.0.3</version> + </plugin> </plugins> </pluginManagement> </build> - + <profiles>  <profile> @@ -273,15 +322,15 @@ </build> </profile> </profiles> - +  - + <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/build/trunk</connection> <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/build/trunk</developerConnection> <url>http://fisheye.jboss.org/browse/Weld/build/trunk</url> </scm> - + <distributionManagement> <repository> <id>oss.sonatype.org/jboss-staging</id>

15 years, 2 months

1
0
0 / 0

Weld SVN: r3952 - extensions/trunk/servlet.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-12 09:47:44 -0400 (Mon, 12 Oct 2009) New Revision: 3952 Modified: extensions/trunk/servlet/pom.xml Log: fix tests after rename, switch build to new structure Modified: extensions/trunk/servlet/pom.xml =================================================================== --- extensions/trunk/servlet/pom.xml 2009-10-12 13:46:24 UTC (rev 3951) +++ extensions/trunk/servlet/pom.xml 2009-10-12 13:47:44 UTC (rev 3952) @@ -3,15 +3,14 @@ <groupId>org.jboss.weld.servlet</groupId> <artifactId>weld-servlet-parent</artifactId> <packaging>pom</packaging> - <version>1.0.0-SNAPSHOT</version> <parent> <groupId>org.jboss.weld</groupId> - <artifactId>weld-version-matrix</artifactId> + <artifactId>weld-extensions-parent</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> - <name>Weld Servlet aggregator</name> + <name>Weld Servlet support build aggregator</name> <url>http://www.seamframework.org/Weld</url> <modules> @@ -20,6 +19,11 @@ <module>support</module> <module>tests</module> </modules> + + <issueManagement> + <system>JIRA</system> + <url>https://jira.jboss.org/jira/browse/WELDX/component/12312750</url> + </issueManagement> <description> Support for Weld in Servlet Containers @@ -32,126 +36,14 @@ <role>Project Lead</role> </roles> <email>pete.muir(a)jboss.org</email> - <organization>JBoss, a division of Red Hat</organization> + <organization>Red Hat Inc.</organization> <url>http://in.relation.to/Bloggers/Pete</url> </developer> + <developer> + <name>Dan Allen</name> + <organization>Red Hat Inc.</organization> + <url>http://in.relation.to/Bloggers/Pete</url> + </developer> </developers> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <phase>verify</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.0-beta-8</version> - <configuration> - <tagBase>https://svn.jboss.org/repos/weld/extensions/tags</tagBase> - <autoVersionSubmodules>true</autoVersionSubmodules> - </configuration> - </plugin> - </plugins> - <defaultGoal>package</defaultGoal> - - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addDefaultImplementationEntries> - true - </addDefaultImplementationEntries> - <addDefaultSpecificationEntries> - true - </addDefaultSpecificationEntries> - </manifest> - </archive> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>2.0.0-RC</version> - </dependency> - </dependencies> - </dependencyManagement> - - <profiles> - - </profiles> - - <ciManagement> - <system>Hudson</system> - <url /> - </ciManagement> - - <issueManagement> - <system>JIRA</system> - <url>http://jira.jboss.org/browse/WBX</url> - </issueManagement> - - <inceptionYear>2008</inceptionYear> - - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0</url> - </license> - <license> - <name>Lesser Gnu Public License, Version 2.1</name> - <url>http://www.gnu.org/licenses/lgpl-2.1.html</url> - </license> - </licenses> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/extensions</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/extensions</developerConnection> - <url>http://fisheye.jboss.org/browse/Weld/extensions</url> - </scm> - - <distributionManagement> - <repository> - <id>repository.jboss.org</id> - <name>JBoss Releases Repository</name> - <url>dav:https://svn.jboss.org/repos/repository.jboss.org/maven2</url> - </repository> - <snapshotRepository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> - </snapshotRepository> - </distributionManagement> - </project>

15 years, 2 months

1
0
0 / 0

Weld SVN: r3951 - in extensions/trunk: bom and 7 other directories.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-12 09:46:24 -0400 (Mon, 12 Oct 2009) New Revision: 3951 Added: extensions/trunk/bom/ extensions/trunk/bom/pom.xml extensions/trunk/parent/ extensions/trunk/parent/pom.xml Modified: extensions/trunk/logger/pom.xml extensions/trunk/logger/src/test/java/org/jboss/weld/test/log/LoggerInjectionTest.java extensions/trunk/logger/src/test/resources/log4j.xml extensions/trunk/pom.xml extensions/trunk/se/pom.xml extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/beans/ObserverTestBean.java extensions/trunk/wicket/pom.xml Log: fix tests after rename, switch build to new structure Added: extensions/trunk/bom/pom.xml =================================================================== --- extensions/trunk/bom/pom.xml (rev 0) +++ extensions/trunk/bom/pom.xml 2009-10-12 13:46:24 UTC (rev 3951) @@ -0,0 +1,176 @@ +<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> + + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-parent</artifactId> + <version>1-SNAPSHOT</version> + </parent> + + <name>Weld Extensions BOM</name> + <url>http://www.seamframework.org/Weld</url> + +  + <description>Weld Extensions "bill of materials" which can be imported by any project using the Weld Extensions. It provides dependency management for the extensions.</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> + + <properties> + <weld.api.version>1.0-SNAPSHOT</weld.api.version> + <weld.core.version>1.0.0-SNAPSHOT</weld.core.version> +  + <jsf.version>2.0.0-RC</jsf.version> + <weld.wicket.version>1.0.0-SNAPSHOT</weld.wicket.version> + <wicket.version>[1.4.1, 1.5)</wicket.version> + <jboss.test.harness.version>1.1.0-SNAPSHOT</jboss.test.harness.version> + </properties> + +  + <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> + +  + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api-bom</artifactId> + <version>${weld.api.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-bom</artifactId> + <version>${weld.core.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>${jsf.version}</version> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>${jsf.version}</version> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + <version>${testng.version}</version> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket</artifactId> + <version>${wicket.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-wicket</artifactId> + <version>${weld.wicket.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + +  + <profiles> + <profile> + <id>release</id> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <executions> + <execution> + <id>sign-artifacts</id> + <phase>verify</phase> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> + </profile> + </profiles> + +  + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/extensions/trunk/bom</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/extensions/trunk/bom</developerConnection> + <url>http://fisheye.jboss.org/browse/Weld/extensions</url> + </scm> + + <distributionManagement> + <repository> + <id>oss.sonatype.org/jboss-staging</id> + <name>JBoss (Nexus) Release Staging Repository</name> + <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url> + </repository> + <snapshotRepository> + <id>oss.sonatype.org/jboss-snapshots</id> + <name>JBoss (Nexus) Snapshots Repository</name> + <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url> + </snapshotRepository> + </distributionManagement> + +</project> Modified: extensions/trunk/logger/pom.xml =================================================================== --- extensions/trunk/logger/pom.xml 2009-10-12 13:24:04 UTC (rev 3950) +++ extensions/trunk/logger/pom.xml 2009-10-12 13:46:24 UTC (rev 3951) @@ -1,15 +1,33 @@ <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-extensions-parent</artifactId> <groupId>org.jboss.weld</groupId> <version>1.0.0-SNAPSHOT</version> + <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.weld</groupId> <artifactId>weld-logger</artifactId> - <version>1.0.0-SNAPSHOT</version> + +  <name>Weld Injectable Logger</name> + <description>An injectable logger for Weld</description> + + <contributors> + <contributor> + <name>David Allen</name> + <roles> + <role>Module lead</role> + </roles> + </contributor> + </contributors> + + <issueManagement> + <system>JIRA</system> + <url>https://jira.jboss.org/jira/browse/WELDX/component/12312756</url> + </issueManagement> + <dependencies> <dependency> @@ -64,41 +82,8 @@ <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-api</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>jboss-jaxrpc</artifactId> - <groupId>jbossws</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-transaction-api</artifactId> - <groupId>org.jboss.javaee</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-jaxrpc</artifactId> - <groupId>jboss.jbossws</groupId> - </exclusion> - </exclusions> </dependency> </dependencies> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/extensions</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/extensions</developerConnection> - <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/weld/extensions</url> - </scm> - - <build> - <defaultGoal>install</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <tagBase>https://svn.jboss.org/repos/weld/extensions/tags</tagBase> - <autoVersionSubmodules>true</autoVersionSubmodules> - </configuration> - </plugin> - </plugins> - </build> + </project> Modified: extensions/trunk/logger/src/test/java/org/jboss/weld/test/log/LoggerInjectionTest.java =================================================================== --- extensions/trunk/logger/src/test/java/org/jboss/weld/test/log/LoggerInjectionTest.java 2009-10-12 13:24:04 UTC (rev 3950) +++ extensions/trunk/logger/src/test/java/org/jboss/weld/test/log/LoggerInjectionTest.java 2009-10-12 13:46:24 UTC (rev 3951) @@ -28,7 +28,7 @@ * @author David Allen */ @Artifact -@Classes(packages = { "org.jboss.webbeans.log", "org.jboss.webbeans.test.log" }) +@Classes(packages = { "org.jboss.weld.log" }) public class LoggerInjectionTest extends AbstractWeldTest { @Test @@ -37,7 +37,7 @@ Sparrow bird = getCurrentManager().getInstanceByType(Sparrow.class); bird.generateLogMessage(); assert TestAppender.getLastEvent() != null; - assert TestAppender.getLastEvent().getLoggerName().equals("org.jboss.webbeans.test.log.Sparrow"); + assert TestAppender.getLastEvent().getLoggerName().equals("org.jboss.weld.test.log.Sparrow"); } @Test Modified: extensions/trunk/logger/src/test/resources/log4j.xml =================================================================== --- extensions/trunk/logger/src/test/resources/log4j.xml 2009-10-12 13:24:04 UTC (rev 3950) +++ extensions/trunk/logger/src/test/resources/log4j.xml 2009-10-12 13:46:24 UTC (rev 3951) @@ -2,7 +2,7 @@ <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - <appender name="CONSOLE" class="org.jboss.webbeans.test.log.TestAppender"> + <appender name="CONSOLE" class="org.jboss.weld.test.log.TestAppender"> <layout class="org.apache.log4j.PatternLayout">  <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{2}] %m%n"/> Added: extensions/trunk/parent/pom.xml =================================================================== --- extensions/trunk/parent/pom.xml (rev 0) +++ extensions/trunk/parent/pom.xml 2009-10-12 13:46:24 UTC (rev 3951) @@ -0,0 +1,99 @@ +<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-parent</artifactId> + <packaging>pom</packaging> + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-extensions-bom</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../bom</relativePath> + </parent> + + <name>Weld Extensions parent</name> + + <description>Parent POM for Weld Extensions modules, inherited by all Weld Extensions projects.</description> + +  + <url>http://www.seamframework.org/Weld</url> + + <developers> + + <developer> + <name>Pete Muir</name> + <email>pete.muir(a)jboss.org</email> + <organization>Red Hat Inc.</organization> + <url>http://in.relation.to/Bloggers/Pete</url> + </developer> + + </developers> + + <ciManagement> + <system>Hudson</system> + <url /> + </ciManagement> + + <issueManagement> + <system>JIRA</system> + <url>http://jira.jboss.org/browse/WELDX</url> + </issueManagement> + + <inceptionYear>2008</inceptionYear> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0</url> + </license> + </licenses> + + <properties> +  + <testng.version>5.9</testng.version> + <jboss.test.harness.version>1.1.0-SNAPSHOT</jboss.test.harness.version> + <apache.httpclient.version>3.1</apache.httpclient.version> + <junit.version>4.7</junit.version> + <htmlunit.version>2.4</htmlunit.version> + +  + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + </properties> + +  + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness</artifactId> + <version>${jboss.test.harness.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-jboss-as-50</artifactId> + <version>${jboss.test.harness.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-jboss-as-52</artifactId> + <version>${jboss.test.harness.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-jboss-embedded</artifactId> + <version>${jboss.test.harness.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-tomcat</artifactId> + <version>${jboss.test.harness.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + +</project> Modified: extensions/trunk/pom.xml =================================================================== --- extensions/trunk/pom.xml 2009-10-12 13:24:04 UTC (rev 3950) +++ extensions/trunk/pom.xml 2009-10-12 13:46:24 UTC (rev 3951) @@ -1,24 +1,68 @@ <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-parent</artifactId> + <artifactId>weld-extensions-build-aggregator</artifactId> <packaging>pom</packaging> <version>1.0.0-SNAPSHOT</version> - - <parent> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-version-matrix</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> - <name>Weld Extensions aggregator</name> - <url>http://www.seamframework.org/Weld</url> + <name>Weld Extensions Build Aggregator</name> <modules> + <module>bom</module> + <module>parent</module> <module>servlet</module> <module>se</module> <module>logger</module> <module>wicket</module> </modules> + +  + <description>The build aggregator for Weld Extensions, which takes care of calling the modules which make up Weld Extensions</description> +  + <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> + +  + <distributionManagement> + <repository> + <id>oss.sonatype.org/jboss-staging</id> + <name>Sonatype Nexus Maven Repository</name> + <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url> + </repository> + <snapshotRepository> + <id>oss.sonatype.org/jboss-snapshots</id> + <name>Sonatype Nexus Snapshot Repository</name> + <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url> + </snapshotRepository> + </distributionManagement> + +  + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.0-beta-9</version> + <configuration> + <goals>deploy</goals> + <arguments>-Prelease</arguments> + <autoVersionSubmodules>true</autoVersionSubmodules> + <tagBase>https://svn.jboss.org/repos/weld/extensions/tags</tagBase> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.4</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + </project> Modified: extensions/trunk/se/pom.xml =================================================================== --- extensions/trunk/se/pom.xml 2009-10-12 13:24:04 UTC (rev 3950) +++ extensions/trunk/se/pom.xml 2009-10-12 13:46:24 UTC (rev 3951) @@ -1,85 +1,78 @@ <?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"> - <parent> - <artifactId>weld-parent</artifactId> - <groupId>org.jboss.weld</groupId> - <version>1.0.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-se</artifactId> - <packaging>jar</packaging> - <name>Weld SE Module</name> - <url>http://maven.apache.org</url> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <tagBase>https://svn.jboss.org/repos/weld/extensions/tags</tagBase> - <autoVersionSubmodules>true</autoVersionSubmodules> - </configuration> - </plugin> - </plugins> - </build> +<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> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-se</artifactId> + <packaging>jar</packaging> + <name>Weld SE Support</name> - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <scope>test</scope> - <classifier>jdk15</classifier> - <exclusions> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - </exclusions> - </dependency> + <description>Weld support for Java SE</description> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-spi</artifactId> - <exclusions> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - <exclusion> - <groupId>javax.ejb</groupId> - <artifactId>ejb-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.jta</groupId> - <artifactId>transaction-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - </dependency> + <developers> + <developer> + <name>Pete Royle</name> + <roles> + <role>Module lead</role> + </roles> + </developer> + </developers> - </dependencies> + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <scope>test</scope> + <classifier>jdk15</classifier> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + </exclusions> + </dependency> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/extensions</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/extensions</developerConnection> - <url>http://fisheye.jboss.org/browse/Weld/extensions</url> - </scm> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-spi</artifactId> + <exclusions> + <exclusion> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + </exclusion> + <exclusion> + <groupId>javax.ejb</groupId> + <artifactId>ejb-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.jta</groupId> + <artifactId>transaction-api</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </dependency> + + </dependencies> + </project> Modified: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/beans/ObserverTestBean.java =================================================================== --- extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/beans/ObserverTestBean.java 2009-10-12 13:24:04 UTC (rev 3950) +++ extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/beans/ObserverTestBean.java 2009-10-12 13:46:24 UTC (rev 3951) @@ -19,7 +19,6 @@ import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.AfterDeploymentValidation; import javax.enterprise.inject.spi.Extension; -import javax.inject.Inject; import org.jboss.weld.environment.se.events.ContainerInitialized; @@ -35,7 +34,8 @@ private static boolean customObserved = false; private static boolean initObserved = false; - @Inject MainTestBean bean; + // TODO PLM injection isn't supported in extensions + // @Inject MainTestBean bean; public ObserverTestBean() { @@ -44,21 +44,21 @@ public void observeBuiltInEvent(@Observes AfterDeploymentValidation after) { builtInObserved = true; - assert this.bean == null; + // assert this.bean == null; } public void observeCustomEvent(@Observes CustomEvent event) { customObserved = true; - assert this.bean != null; + //assert this.bean != null; } public void observeInitEvent(@Observes ContainerInitialized event) { - initObserved = true; - assert this.bean != null; + initObserved = true; + //assert this.bean != null; } - + public static void reset() { customObserved = false; Modified: extensions/trunk/wicket/pom.xml =================================================================== --- extensions/trunk/wicket/pom.xml 2009-10-12 13:24:04 UTC (rev 3950) +++ extensions/trunk/wicket/pom.xml 2009-10-12 13:46:24 UTC (rev 3951) @@ -2,14 +2,30 @@ 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-version-matrix</artifactId> + <artifactId>weld-extensions-parent</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.weld</groupId> <artifactId>weld-wicket</artifactId> - <version>1.0.0-SNAPSHOT</version> - <name>Weld Wicket Integration</name> + <name>Weld Wicket support</name> + + <description>Weld support for Apache Wicket</description> + + <developers> + <developer> + <name>Clint Popetz</name> + <roles> + <role>Module lead</role> + </roles> + </developer> + </developers> + + <issueManagement> + <system>JIRA</system> + <url>https://jira.jboss.org/jira/browse/WELDX/component/12312752</url> + </issueManagement> + <dependencies> <dependency> @@ -45,24 +61,4 @@ </dependencies> - <build> - <defaultGoal>install</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <tagBase>https://svn.jboss.org/repos/weld/extensions/tags</tagBase> - <autoVersionSubmodules>true</autoVersionSubmodules> - </configuration> - </plugin> - </plugins> - </build> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/extensions</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/extensions</developerConnection> - <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/weld/extensions</url> - </scm> - </project>

15 years, 2 months

1
0
0 / 0

Weld SVN: r3950 - in core/trunk: impl and 1 other directories.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-12 09:24:04 -0400 (Mon, 12 Oct 2009) New Revision: 3950 Modified: core/trunk/bom/pom.xml core/trunk/impl/pom.xml core/trunk/parent/pom.xml Log: use parent pom and workaround WELD-198 Modified: core/trunk/bom/pom.xml =================================================================== --- core/trunk/bom/pom.xml 2009-10-12 13:06:22 UTC (rev 3949) +++ core/trunk/bom/pom.xml 2009-10-12 13:24:04 UTC (rev 3950) @@ -5,6 +5,12 @@ <artifactId>weld-core-bom</artifactId> <packaging>pom</packaging> <version>1.0.0-SNAPSHOT</version> + + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-parent</artifactId> + <version>1-SNAPSHOT</version> + </parent> <name>Weld Core BOM</name> <url>http://www.seamframework.org/Weld</url> Modified: core/trunk/impl/pom.xml =================================================================== --- core/trunk/impl/pom.xml 2009-10-12 13:06:22 UTC (rev 3949) +++ core/trunk/impl/pom.xml 2009-10-12 13:24:04 UTC (rev 3950) @@ -99,14 +99,16 @@ <dependency> <groupId>org.jboss.interceptor</groupId> <artifactId>jboss-interceptor-api</artifactId> - <optional>true</optional> +  + </dependency> <dependency> <groupId>org.jboss.interceptor</groupId> <artifactId>jboss-interceptor</artifactId> - <optional>true</optional> +  + </dependency> </dependencies> Modified: core/trunk/parent/pom.xml =================================================================== --- core/trunk/parent/pom.xml 2009-10-12 13:06:22 UTC (rev 3949) +++ core/trunk/parent/pom.xml 2009-10-12 13:24:04 UTC (rev 3950) @@ -163,243 +163,4 @@ </dependencies> </dependencyManagement> -  - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> - </plugins> - <defaultGoal>package</defaultGoal> - -  - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.0-beta-9</version> - <configuration> - <tagBase>https://svn.jboss.org/repos/weld/extensions/tags</tagBase> - <autoVersionSubmodules>true</autoVersionSubmodules> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.4.3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <version>2.3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.4</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>2.3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>2.0.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>2.0.4</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>2.4.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.4</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <version>1.0-alpha-4</version> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>2.0.0</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-beta-1</version> - <executions> - <execution> - <id>enforce</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <requireMavenVersion> - <version>2.0.9</version> - </requireMavenVersion> - <requirePluginVersions> - <unCheckedPlugins> - <unCheckedPlugin>org.apache.maven.plugins:maven-eclipse-plugin</unCheckedPlugin> - </unCheckedPlugins> - </requirePluginVersions> - </rules> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>1.2.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> - <configuration> - <archive> - <manifest> - <addDefaultImplementationEntries> - true - </addDefaultImplementationEntries> - <addDefaultSpecificationEntries> - true - </addDefaultSpecificationEntries> - </manifest> - <manifestEntries> - <Implementation-URL>${pom.url}</Implementation-URL> - </manifestEntries> - <manifestSections> - <manifestSection> - <name>Build-Information</name> - <manifestEntries> - <Maven-Version>${maven.version}</Maven-Version> - <Java-Version>${java.version}</Java-Version> - <Java-Vendor>${java.vendor}</Java-Vendor> - <Os-Name>${os.name}</Os-Name> - <Os-Arch>${os.arch}</Os-Arch> - <Os-Version>${os.version}</Os-Version> - <Scm-Revision>${buildNumber}</Scm-Revision> - <Build-Time>${timestamp}</Build-Time> - </manifestEntries> - </manifestSection> - </manifestSections> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.4</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>maven-version</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-eclipse-plugin</artifactId> - <configuration> - <classpathContainers> - <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer> - </classpathContainers> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>buildnumber-maven-plugin</artifactId> - <version>1.0-beta-3</version> - <executions> - <execution> - <id>set-build-properties</id> - <goals> - <goal>create</goal> - </goals> - <phase>validate</phase> - </execution> - </executions> - <inherited>true</inherited> - <configuration> -  - <getRevisionOnlyOnce>true</getRevisionOnlyOnce> - <revisionOnScmFailure>unavailable</revisionOnScmFailure> - <timestampFormat>{0, date, long} {0, time, long}</timestampFormat> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - -  - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/extensions</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/extensions</developerConnection> - <url>http://fisheye.jboss.org/browse/Weld/extensions</url> - </scm> - - <distributionManagement> - <repository> - <id>oss.sonatype.org/jboss-staging</id> - <name>Sonatype Nexus Maven Repository</name> - <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url> - </repository> - <snapshotRepository> - <id>oss.sonatype.org/jboss-snapshots</id> - <name>Sonatype Nexus Snapshot Repository</name> - <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url> - </snapshotRepository> - </distributionManagement> - </project>

15 years, 2 months

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