February 2010 - weld-commits - Jboss List Archives

Weld SVN: r5757 - in extensions/trunk/core/src/main/java/org/jboss/weld/extensions: util and 1 other directory.

by weld-commits＠lists.jboss.org

Author: swd847 Date: 2010-02-04 23:34:53 -0500 (Thu, 04 Feb 2010) New Revision: 5757 Modified: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/CoreExtension.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/BeanImpl.java Log: Removed String.isEmpty() calls to maintain java 5 compatibility Modified: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/CoreExtension.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/CoreExtension.java 2010-02-05 00:06:39 UTC (rev 5756) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/CoreExtension.java 2010-02-05 04:34:53 UTC (rev 5757) @@ -148,7 +148,7 @@ private String getPackageName(Package pkg) { String packageName = pkg.getAnnotation(Named.class).value(); - if (packageName.isEmpty()) + if (packageName.length() == 0) { packageName = pkg.getName(); } @@ -158,7 +158,7 @@ private <X> String getName(Annotated annotated, String defaultName) { String beanName = annotated.getAnnotation(Named.class).value(); - if (beanName.isEmpty()) + if (beanName.length() == 0) { beanName = defaultName.substring(0, 1).toLowerCase() + defaultName.substring(1); } Modified: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/BeanImpl.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/BeanImpl.java 2010-02-05 00:06:39 UTC (rev 5756) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/BeanImpl.java 2010-02-05 04:34:53 UTC (rev 5757) @@ -47,7 +47,7 @@ { this.name = rtc.getAnnotation(Named.class).value(); // no name defaulting for constructors - if (this.name.isEmpty()) + if (this.name.length() == 0) { throw new RuntimeException(); }

14 years, 3 months

1
0
0 / 0

Weld SVN: r5756 - wicket/trunk.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-02-04 19:06:39 -0500 (Thu, 04 Feb 2010) New Revision: 5756 Modified: wicket/trunk/pom.xml Log: update versions Modified: wicket/trunk/pom.xml =================================================================== --- wicket/trunk/pom.xml 2010-02-05 00:04:23 UTC (rev 5755) +++ wicket/trunk/pom.xml 2010-02-05 00:06:39 UTC (rev 5756) @@ -28,8 +28,8 @@ </issueManagement> <properties> - <weld.api.version>1.0</weld.api.version> - <weld.core.version>1.0.1-SNAPSHOT</weld.core.version> + <weld.api.version>1.0-SP1</weld.api.version> + <weld.core.version>1.0.1-CR2</weld.core.version> <testng.version>5.10</testng.version> <wicket.version>1.4.1</wicket.version> </properties>

14 years, 3 months

1
0
0 / 0

Weld SVN: r5755 - servlet/trunk.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-02-04 19:04:23 -0500 (Thu, 04 Feb 2010) New Revision: 5755 Modified: servlet/trunk/pom.xml Log: update versions Modified: servlet/trunk/pom.xml =================================================================== --- servlet/trunk/pom.xml 2010-02-05 00:03:52 UTC (rev 5754) +++ servlet/trunk/pom.xml 2010-02-05 00:04:23 UTC (rev 5755) @@ -48,8 +48,8 @@ </developers> <properties> - <weld.api.version>1.0</weld.api.version> - <weld.core.version>1.0.1-CR1</weld.core.version> + <weld.api.version>1.0-SP1</weld.api.version> + <weld.core.version>1.0.1-CR2</weld.core.version>  <jsf.version>2.0.0-RC</jsf.version> <tomcat.version>6.0.20</tomcat.version>

14 years, 3 months

1
0
0 / 0

Weld SVN: r5754 - java-se/trunk.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-02-04 19:03:52 -0500 (Thu, 04 Feb 2010) New Revision: 5754 Modified: java-se/trunk/pom.xml Log: update versions Modified: java-se/trunk/pom.xml =================================================================== --- java-se/trunk/pom.xml 2010-02-05 00:03:18 UTC (rev 5753) +++ java-se/trunk/pom.xml 2010-02-05 00:03:52 UTC (rev 5754) @@ -27,8 +27,8 @@ <properties>  <testng.version>5.10</testng.version> - <weld.api.version>1.0</weld.api.version> - <weld.core.version>1.0.1-CR1</weld.core.version> + <weld.api.version>1.0-SP1</weld.api.version> + <weld.core.version>1.0.1-CR2</weld.core.version> <slf4j.version>1.5.10</slf4j.version> </properties>

14 years, 3 months

1
0
0 / 0

Weld SVN: r5753 - in examples/trunk/jsf: permalink and 1 other directory.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-02-04 19:03:18 -0500 (Thu, 04 Feb 2010) New Revision: 5753 Modified: examples/trunk/jsf/numberguess/readme.txt examples/trunk/jsf/permalink/readme.txt Log: recommend the use of clean :-) Modified: examples/trunk/jsf/numberguess/readme.txt =================================================================== --- examples/trunk/jsf/numberguess/readme.txt 2010-02-04 23:02:26 UTC (rev 5752) +++ examples/trunk/jsf/numberguess/readme.txt 2010-02-05 00:03:18 UTC (rev 5753) @@ -56,7 +56,7 @@ You can deploy it as an exploded archive immediately after the war goal is finished assembling the exploded structure: - mvn compile war:exploded tomcat:exploded -Ptomcat + mvn clean compile war:exploded tomcat:exploded -Ptomcat Once the application is deployed, you can redeploy it using this command: Modified: examples/trunk/jsf/permalink/readme.txt =================================================================== --- examples/trunk/jsf/permalink/readme.txt 2010-02-04 23:02:26 UTC (rev 5752) +++ examples/trunk/jsf/permalink/readme.txt 2010-02-05 00:03:18 UTC (rev 5753) @@ -46,7 +46,7 @@ You can deploy the packaged archive to Tomcat via HTTP PUT using this command: - mvn package tomcat:deploy -Ptomcat + mvn clean package tomcat:deploy -Ptomcat Then you use this command to undeploy the application:

14 years, 3 months

1
0
0 / 0

Weld SVN: r5752 - in core/trunk: bom and 7 other directories.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-02-04 18:02:26 -0500 (Thu, 04 Feb 2010) New Revision: 5752 Modified: core/trunk/bom/pom.xml core/trunk/impl/pom.xml core/trunk/inject-tck-runner/pom.xml core/trunk/jboss-tck-runner/pom.xml core/trunk/osgi-bundle/pom.xml core/trunk/parent/pom.xml core/trunk/pom.xml core/trunk/porting-package/pom.xml core/trunk/tests/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: core/trunk/bom/pom.xml =================================================================== --- core/trunk/bom/pom.xml 2010-02-04 23:02:06 UTC (rev 5751) +++ core/trunk/bom/pom.xml 2010-02-04 23:02:26 UTC (rev 5752) @@ -3,7 +3,7 @@ <groupId>org.jboss.weld</groupId> <artifactId>weld-core-bom</artifactId> <packaging>pom</packaging> - <version>1.0.1-CR2</version> + <version>1.0.1-SNAPSHOT</version> <parent> <groupId>org.jboss.weld</groupId> @@ -176,9 +176,9 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-CR2/bom</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-CR2/bom</developerConnection> - <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-CR2/bom</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/bom</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk/bom</developerConnection> + <url>http://fisheye.jboss.org/browse/weld/core/trunk/bom</url> </scm> </project> Modified: core/trunk/impl/pom.xml =================================================================== --- core/trunk/impl/pom.xml 2010-02-04 23:02:06 UTC (rev 5751) +++ core/trunk/impl/pom.xml 2010-02-04 23:02:26 UTC (rev 5752) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.1-CR2</version> + <version>1.0.1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -178,9 +178,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-CR2/impl</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-CR2/impl</developerConnection> - <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-CR2/impl</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/impl</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk/impl</developerConnection> + <url>http://fisheye.jboss.org/browse/weld/core/trunk/impl</url> </scm> </project> Modified: core/trunk/inject-tck-runner/pom.xml =================================================================== --- core/trunk/inject-tck-runner/pom.xml 2010-02-04 23:02:06 UTC (rev 5751) +++ core/trunk/inject-tck-runner/pom.xml 2010-02-04 23:02:26 UTC (rev 5752) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.1-CR2</version> + <version>1.0.1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -87,9 +87,9 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-CR2/inject-tc...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-CR2/inject-tck-r...</developerConnection> - <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-CR2/inject-tck-runner</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/inject-tck-runner</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk/inject-tck-runner</developerConnection> + <url>http://fisheye.jboss.org/browse/weld/core/trunk/inject-tck-runner</url> </scm> </project> Modified: core/trunk/jboss-tck-runner/pom.xml =================================================================== --- core/trunk/jboss-tck-runner/pom.xml 2010-02-04 23:02:06 UTC (rev 5751) +++ core/trunk/jboss-tck-runner/pom.xml 2010-02-04 23:02:26 UTC (rev 5752) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.1-CR2</version> + <version>1.0.1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -314,9 +314,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-CR2/jboss-tck...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-CR2/jboss-tck-ru...</developerConnection> - <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-CR2/jboss-tck-runner</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/jboss-tck-runner</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk/jboss-tck-runner</developerConnection> + <url>http://fisheye.jboss.org/browse/weld/core/trunk/jboss-tck-runner</url> </scm> </project> Modified: core/trunk/osgi-bundle/pom.xml =================================================================== --- core/trunk/osgi-bundle/pom.xml 2010-02-04 23:02:06 UTC (rev 5751) +++ core/trunk/osgi-bundle/pom.xml 2010-02-04 23:02:26 UTC (rev 5752) @@ -16,7 +16,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.1-CR2</version> + <version>1.0.1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -193,9 +193,9 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-CR2/osgi-bundle</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-CR2/osgi-bundle</developerConnection> - <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-CR2/osgi-bundle</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/osgi-bundle</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk/osgi-bundle</developerConnection> + <url>http://fisheye.jboss.org/browse/weld/core/trunk/osgi-bundle</url> </scm> </project> Modified: core/trunk/parent/pom.xml =================================================================== --- core/trunk/parent/pom.xml 2010-02-04 23:02:06 UTC (rev 5751) +++ core/trunk/parent/pom.xml 2010-02-04 23:02:26 UTC (rev 5752) @@ -7,7 +7,7 @@ <parent> <groupId>org.jboss.weld</groupId> <artifactId>weld-core-bom</artifactId> - <version>1.0.1-CR2</version> + <version>1.0.1-SNAPSHOT</version> <relativePath>../bom</relativePath> </parent> @@ -171,9 +171,9 @@ </dependencyManagement> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-CR2/parent</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-CR2/parent</developerConnection> - <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-CR2/parent</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/parent</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk/parent</developerConnection> + <url>http://fisheye.jboss.org/browse/weld/core/trunk/parent</url> </scm> </project> Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2010-02-04 23:02:06 UTC (rev 5751) +++ core/trunk/pom.xml 2010-02-04 23:02:26 UTC (rev 5752) @@ -3,7 +3,7 @@ <groupId>org.jboss.weld</groupId> <artifactId>weld-core-build-aggregator</artifactId> <packaging>pom</packaging> - <version>1.0.1-CR2</version> + <version>1.0.1-SNAPSHOT</version> <parent> <groupId>org.jboss.weld</groupId> @@ -23,9 +23,9 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-CR2</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-CR2</developerConnection> - <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-CR2</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk</developerConnection> + <url>http://fisheye.jboss.org/browse/Weld</url> </scm> <profiles> Modified: core/trunk/porting-package/pom.xml =================================================================== --- core/trunk/porting-package/pom.xml 2010-02-04 23:02:06 UTC (rev 5751) +++ core/trunk/porting-package/pom.xml 2010-02-04 23:02:26 UTC (rev 5752) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.1-CR2</version> + <version>1.0.1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -55,9 +55,9 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-CR2/porting-p...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-CR2/porting-package</developerConnection> - <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-CR2/porting-package</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/porting-package</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk/porting-package</developerConnection> + <url>http://fisheye.jboss.org/browse/weld/core/trunk/porting-package</url> </scm> </project> Modified: core/trunk/tests/pom.xml =================================================================== --- core/trunk/tests/pom.xml 2010-02-04 23:02:06 UTC (rev 5751) +++ core/trunk/tests/pom.xml 2010-02-04 23:02:26 UTC (rev 5752) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.1-CR2</version> + <version>1.0.1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -282,9 +282,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-CR2/tests</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-CR2/tests</developerConnection> - <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-CR2/tests</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/tests</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk/tests</developerConnection> + <url>http://fisheye.jboss.org/browse/weld/core/trunk/tests</url> </scm> </project>

14 years, 3 months

1
0
0 / 0

Weld SVN: r5751 - core/tags.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-02-04 18:02:06 -0500 (Thu, 04 Feb 2010) New Revision: 5751 Added: core/tags/1.0.1-CR2/ Log: [maven-scm] copy for tag 1.0.1-CR2 Copied: core/tags/1.0.1-CR2 (from rev 5750, core/trunk)

14 years, 3 months

1
0
0 / 0

Weld SVN: r5750 - in core/trunk: bom and 7 other directories.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-02-04 18:01:40 -0500 (Thu, 04 Feb 2010) New Revision: 5750 Modified: core/trunk/bom/pom.xml core/trunk/impl/pom.xml core/trunk/inject-tck-runner/pom.xml core/trunk/jboss-tck-runner/pom.xml core/trunk/osgi-bundle/pom.xml core/trunk/parent/pom.xml core/trunk/pom.xml core/trunk/porting-package/pom.xml core/trunk/tests/pom.xml Log: [maven-release-plugin] prepare release 1.0.1-CR2 Modified: core/trunk/bom/pom.xml =================================================================== --- core/trunk/bom/pom.xml 2010-02-04 22:49:55 UTC (rev 5749) +++ core/trunk/bom/pom.xml 2010-02-04 23:01:40 UTC (rev 5750) @@ -3,7 +3,7 @@ <groupId>org.jboss.weld</groupId> <artifactId>weld-core-bom</artifactId> <packaging>pom</packaging> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1-CR2</version> <parent> <groupId>org.jboss.weld</groupId> @@ -176,9 +176,9 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/bom</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk/bom</developerConnection> - <url>http://fisheye.jboss.org/browse/weld/core/trunk/bom</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-CR2/bom</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-CR2/bom</developerConnection> + <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-CR2/bom</url> </scm> </project> Modified: core/trunk/impl/pom.xml =================================================================== --- core/trunk/impl/pom.xml 2010-02-04 22:49:55 UTC (rev 5749) +++ core/trunk/impl/pom.xml 2010-02-04 23:01:40 UTC (rev 5750) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1-CR2</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -178,9 +178,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/impl</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk/impl</developerConnection> - <url>http://fisheye.jboss.org/browse/weld/core/trunk/impl</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-CR2/impl</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-CR2/impl</developerConnection> + <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-CR2/impl</url> </scm> </project> Modified: core/trunk/inject-tck-runner/pom.xml =================================================================== --- core/trunk/inject-tck-runner/pom.xml 2010-02-04 22:49:55 UTC (rev 5749) +++ core/trunk/inject-tck-runner/pom.xml 2010-02-04 23:01:40 UTC (rev 5750) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1-CR2</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -87,9 +87,9 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/inject-tck-runner</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk/inject-tck-runner</developerConnection> - <url>http://fisheye.jboss.org/browse/weld/core/trunk/inject-tck-runner</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-CR2/inject-tc...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-CR2/inject-tck-r...</developerConnection> + <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-CR2/inject-tck-runner</url> </scm> </project> Modified: core/trunk/jboss-tck-runner/pom.xml =================================================================== --- core/trunk/jboss-tck-runner/pom.xml 2010-02-04 22:49:55 UTC (rev 5749) +++ core/trunk/jboss-tck-runner/pom.xml 2010-02-04 23:01:40 UTC (rev 5750) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1-CR2</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -314,9 +314,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/jboss-tck-runner</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk/jboss-tck-runner</developerConnection> - <url>http://fisheye.jboss.org/browse/weld/core/trunk/jboss-tck-runner</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-CR2/jboss-tck...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-CR2/jboss-tck-ru...</developerConnection> + <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-CR2/jboss-tck-runner</url> </scm> </project> Modified: core/trunk/osgi-bundle/pom.xml =================================================================== --- core/trunk/osgi-bundle/pom.xml 2010-02-04 22:49:55 UTC (rev 5749) +++ core/trunk/osgi-bundle/pom.xml 2010-02-04 23:01:40 UTC (rev 5750) @@ -16,7 +16,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1-CR2</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -193,9 +193,9 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/osgi-bundle</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk/osgi-bundle</developerConnection> - <url>http://fisheye.jboss.org/browse/weld/core/trunk/osgi-bundle</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-CR2/osgi-bundle</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-CR2/osgi-bundle</developerConnection> + <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-CR2/osgi-bundle</url> </scm> </project> Modified: core/trunk/parent/pom.xml =================================================================== --- core/trunk/parent/pom.xml 2010-02-04 22:49:55 UTC (rev 5749) +++ core/trunk/parent/pom.xml 2010-02-04 23:01:40 UTC (rev 5750) @@ -7,7 +7,7 @@ <parent> <groupId>org.jboss.weld</groupId> <artifactId>weld-core-bom</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1-CR2</version> <relativePath>../bom</relativePath> </parent> @@ -171,9 +171,9 @@ </dependencyManagement> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/parent</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk/parent</developerConnection> - <url>http://fisheye.jboss.org/browse/weld/core/trunk/parent</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-CR2/parent</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-CR2/parent</developerConnection> + <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-CR2/parent</url> </scm> </project> Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2010-02-04 22:49:55 UTC (rev 5749) +++ core/trunk/pom.xml 2010-02-04 23:01:40 UTC (rev 5750) @@ -3,7 +3,7 @@ <groupId>org.jboss.weld</groupId> <artifactId>weld-core-build-aggregator</artifactId> <packaging>pom</packaging> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1-CR2</version> <parent> <groupId>org.jboss.weld</groupId> @@ -23,9 +23,9 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/Weld</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-CR2</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-CR2</developerConnection> + <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-CR2</url> </scm> <profiles> Modified: core/trunk/porting-package/pom.xml =================================================================== --- core/trunk/porting-package/pom.xml 2010-02-04 22:49:55 UTC (rev 5749) +++ core/trunk/porting-package/pom.xml 2010-02-04 23:01:40 UTC (rev 5750) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1-CR2</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -55,9 +55,9 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/porting-package</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk/porting-package</developerConnection> - <url>http://fisheye.jboss.org/browse/weld/core/trunk/porting-package</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-CR2/porting-p...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-CR2/porting-package</developerConnection> + <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-CR2/porting-package</url> </scm> </project> Modified: core/trunk/tests/pom.xml =================================================================== --- core/trunk/tests/pom.xml 2010-02-04 22:49:55 UTC (rev 5749) +++ core/trunk/tests/pom.xml 2010-02-04 23:01:40 UTC (rev 5750) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1-CR2</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -282,9 +282,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/tests</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk/tests</developerConnection> - <url>http://fisheye.jboss.org/browse/weld/core/trunk/tests</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-CR2/tests</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-CR2/tests</developerConnection> + <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-CR2/tests</url> </scm> </project>

14 years, 3 months

1
0
0 / 0

Weld SVN: r5749 - in servlet/trunk/int: src/main/java/org/jboss/weld/environment/servlet and 1 other directory.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-02-04 17:49:55 -0500 (Thu, 04 Feb 2010) New Revision: 5749 Modified: servlet/trunk/int/pom.xml servlet/trunk/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java Log: force javasisst to use TCCL on TC Modified: servlet/trunk/int/pom.xml =================================================================== --- servlet/trunk/int/pom.xml 2010-02-04 22:03:26 UTC (rev 5748) +++ servlet/trunk/int/pom.xml 2010-02-04 22:49:55 UTC (rev 5749) @@ -1,5 +1,6 @@ <?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-servlet-parent</artifactId> <groupId>org.jboss.weld.servlet</groupId> @@ -69,6 +70,11 @@ <artifactId>slf4j-api</artifactId> </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + </dependencies> <scm> Modified: servlet/trunk/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java =================================================================== --- servlet/trunk/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java 2010-02-04 22:03:26 UTC (rev 5748) +++ servlet/trunk/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java 2010-02-04 22:49:55 UTC (rev 5749) @@ -16,6 +16,9 @@ */ package org.jboss.weld.environment.servlet; +import javassist.util.proxy.ProxyFactory; +import javassist.util.proxy.ProxyFactory.ClassLoaderProvider; + import javax.el.ELContextListener; import javax.servlet.ServletContextEvent; import javax.servlet.jsp.JspApplicationContext; @@ -124,6 +127,16 @@ if (tomcat) { + // Make Javassist always use the TCCL to load classes + ProxyFactory.classLoaderProvider = new ClassLoaderProvider() + { + + public ClassLoader get(ProxyFactory pf) + { + return Thread.currentThread().getContextClassLoader(); + } + + }; // Try pushing a Tomcat AnnotationProcessor into the servlet context try {

14 years, 3 months

1
0
0 / 0

Weld SVN: r5748 - core/trunk/impl/src/main/java/org/jboss/weld/bootstrap.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-02-04 17:03:26 -0500 (Thu, 04 Feb 2010) New Revision: 5748 Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java Log: only validate enabled decorators Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java 2010-02-04 21:22:55 UTC (rev 5747) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java 2010-02-04 22:03:26 UTC (rev 5748) @@ -259,7 +259,7 @@ Annotation[] bindings = ij.getQualifiers().toArray(new Annotation[0]); WeldAnnotated<?, ?> annotatedItem = ResolvableWeldClass.of(ij.getType(), bindings, beanManager); Set<?> resolvedBeans = beanManager.getBeanResolver().resolve(beanManager.getInjectableBeans(ij)); - if (resolvedBeans.isEmpty()) + if (!isInjectionPointSatisfied(ij, resolvedBeans, beanManager)) { throw new DeploymentException(INJECTION_POINT_HAS_UNSATISFIED_DEPENDENCIES, ij, Arrays.toString(bindings)); } @@ -267,19 +267,23 @@ { throw new DeploymentException(INJECTION_POINT_HAS_AMBIGUOUS_DEPENDENCIES, ij, Arrays.toString(bindings) + "; Possible dependencies: " + resolvedBeans); } - Bean<?> resolvedBean = (Bean<?>) resolvedBeans.iterator().next(); - if (beanManager.getServices().get(MetaAnnotationStore.class).getScopeModel(resolvedBean.getScope()).isNormal() && !Proxies.isTypeProxyable(ij.getType())) + // Account for the case this is disabled decorator + if (!resolvedBeans.isEmpty()) { - throw new UnproxyableResolutionException(INJECTION_POINT_HAS_NON_PROXYABLE_DEPENDENCIES, ij); + Bean<?> resolvedBean = (Bean<?>) resolvedBeans.iterator().next(); + if (beanManager.getServices().get(MetaAnnotationStore.class).getScopeModel(resolvedBean.getScope()).isNormal() && !Proxies.isTypeProxyable(ij.getType())) + { + throw new UnproxyableResolutionException(INJECTION_POINT_HAS_NON_PROXYABLE_DEPENDENCIES, ij); + } + if (annotatedItem.isPrimitive() && resolvedBean.isNullable()) + { + throw new NullableDependencyException(INJECTION_POINT_HAS_NULLABLE_DEPENDENCIES, ij); + } + if (ij.getBean() != null && Beans.isPassivatingScope(ij.getBean(), beanManager) && (!ij.isTransient()) && !Beans.isPassivationCapableBean(resolvedBean)) + { + validateInjectionPointPassivationCapable(ij, resolvedBean, beanManager); + } } - if (annotatedItem.isPrimitive() && resolvedBean.isNullable()) - { - throw new NullableDependencyException(INJECTION_POINT_HAS_NULLABLE_DEPENDENCIES, ij); - } - if (ij.getBean() != null && Beans.isPassivatingScope(ij.getBean(), beanManager) && (!ij.isTransient()) && !Beans.isPassivationCapableBean(resolvedBean)) - { - validateInjectionPointPassivationCapable(ij, resolvedBean, beanManager); - } } public void validateInjectionPointPassivationCapable(InjectionPoint ij, Bean<?> resolvedBean, BeanManagerImpl beanManager) @@ -461,6 +465,25 @@ } } + + private static boolean isInjectionPointSatisfied(InjectionPoint ij, Set<?> resolvedBeans, BeanManagerImpl beanManager) + { + if (ij.getBean() instanceof Decorator<?>) + { + if (beanManager.getEnabledDecoratorClasses().contains(ij.getBean().getBeanClass())) + { + return resolvedBeans.size() > 0; + } + else + { + return true; + } + } + else + { + return resolvedBeans.size() > 0; + } + } public void cleanup() {

14 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits February 2010