Weld SVN: r4657 - cdi-tck/tags.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-04 11:33:42 -0500 (Wed, 04 Nov 2009)
New Revision: 4657
Added:
cdi-tck/tags/1.0.0-CR6/
Log:
[maven-scm] copy for tag 1.0.0-CR6
Copied: cdi-tck/tags/1.0.0-CR6 (from rev 4656, cdi-tck/trunk)
16 years, 5 months
Weld SVN: r4656 - in cdi-tck/trunk: api and 2 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-04 11:33:22 -0500 (Wed, 04 Nov 2009)
New Revision: 4656
Modified:
cdi-tck/trunk/api/pom.xml
cdi-tck/trunk/doc/reference/pom.xml
cdi-tck/trunk/impl/pom.xml
cdi-tck/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 1.0.0-CR6
Modified: cdi-tck/trunk/api/pom.xml
===================================================================
--- cdi-tck/trunk/api/pom.xml 2009-11-04 16:32:09 UTC (rev 4655)
+++ cdi-tck/trunk/api/pom.xml 2009-11-04 16:33:22 UTC (rev 4656)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-CR6</version>
</parent>
<groupId>org.jboss.jsr299.tck</groupId>
Modified: cdi-tck/trunk/doc/reference/pom.xml
===================================================================
--- cdi-tck/trunk/doc/reference/pom.xml 2009-11-04 16:32:09 UTC (rev 4655)
+++ cdi-tck/trunk/doc/reference/pom.xml 2009-11-04 16:33:22 UTC (rev 4656)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-CR6</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -61,9 +61,9 @@
</build>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/trunk</developerConnection>
- <url>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/trunk/jsr299-tck-referen...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/tags/1.0.0-CR6</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0.0-CR6</developerConnection>
+ <url>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/jsr299-tck-referenc...</url>
</scm>
</project>
Modified: cdi-tck/trunk/impl/pom.xml
===================================================================
--- cdi-tck/trunk/impl/pom.xml 2009-11-04 16:32:09 UTC (rev 4655)
+++ cdi-tck/trunk/impl/pom.xml 2009-11-04 16:33:22 UTC (rev 4656)
@@ -3,7 +3,7 @@
<parent>
<artifactId>jsr299-tck-parent</artifactId>
<groupId>org.jboss.jsr299.tck</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-CR6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jsr299.tck</groupId>
Modified: cdi-tck/trunk/pom.xml
===================================================================
--- cdi-tck/trunk/pom.xml 2009-11-04 16:32:09 UTC (rev 4655)
+++ cdi-tck/trunk/pom.xml 2009-11-04 16:33:22 UTC (rev 4656)
@@ -4,7 +4,7 @@
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-CR6</version>
<name>CDI TCK</name>
<parent>
@@ -303,11 +303,11 @@
</build>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/trunk</connection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/tags/1.0.0-CR6</connection>
<developerConnection>
- scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/trunk
+ scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0.0-CR6
</developerConnection>
- <url>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/trunk</url>
+ <url>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0.0-CR6</url>
</scm>
<profiles>
16 years, 5 months
Weld SVN: r4655 - cdi-tck/trunk.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-04 11:32:09 -0500 (Wed, 04 Nov 2009)
New Revision: 4655
Modified:
cdi-tck/trunk/pom.xml
Log:
use parent 5
Modified: cdi-tck/trunk/pom.xml
===================================================================
--- cdi-tck/trunk/pom.xml 2009-11-04 16:27:03 UTC (rev 4654)
+++ cdi-tck/trunk/pom.xml 2009-11-04 16:32:09 UTC (rev 4655)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<!-- Metadata -->
16 years, 5 months
Weld SVN: r4654 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-04 11:27:03 -0500 (Wed, 04 Nov 2009)
New Revision: 4654
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java
Log:
mark broken
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java 2009-11-04 15:08:23 UTC (rev 4653)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java 2009-11-04 16:27:03 UTC (rev 4654)
@@ -28,26 +28,29 @@
@Artifact
@IntegrationTest
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec = "cdi", version = "20091018")
public class SessionBeanInjectionOrderingTest extends AbstractJSR299Test
{
-
+
@Test
@SpecAssertion(section = "5.6.4", id = "bb")
- public void testInitializerCalledAfterFieldInjectionOfSuperclass() {
+ public void testInitializerCalledAfterFieldInjectionOfSuperclass()
+ {
MegaPoorHenHouseLocal house = getInstanceByType(MegaPoorHenHouseLocal.class);
assert house.isInitializerCalledAfterSuperclassInjection();
}
-
- @Test
+
+ @Test(groups="ri-broken")
@SpecAssertion(section = "5.6.4", id = "bf")
- public void testPostConstructCalledAfterInitializerOfSuperclass() {
+ public void testPostConstructCalledAfterInitializerOfSuperclass()
+ {
assert getInstanceByType(MegaPoorHenHouseLocal.class).isPostConstructCalledAfterSuperclassInitializer();
}
-
- @Test
+
+ @Test(groups="ri-broken")
@SpecAssertion(section = "5.6.4", id = "bc")
- public void testInitializerCalledAfterResourceInjection() {
+ public void testInitializerCalledAfterResourceInjection()
+ {
assert getInstanceByType(InjectedSessionBeanLocal.class).isInitializerCalledAfterResourceInjection();
}
}
16 years, 5 months
Weld SVN: r4653 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-04 10:08:23 -0500 (Wed, 04 Nov 2009)
New Revision: 4653
Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java
Log:
minor
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java 2009-11-04 14:24:02 UTC (rev 4652)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java 2009-11-04 15:08:23 UTC (rev 4653)
@@ -1,9 +1,11 @@
package org.jboss.jsr299.tck.tests.lookup.injection.enterprise;
+import java.io.Serializable;
+
import javax.enterprise.context.Dependent;
@Dependent
-public class Fox
+public class Fox implements Serializable
{
public String getName()
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java 2009-11-04 14:24:02 UTC (rev 4652)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java 2009-11-04 15:08:23 UTC (rev 4653)
@@ -1,9 +1,9 @@
package org.jboss.jsr299.tck.tests.lookup.injection.enterprise;
import javax.annotation.PostConstruct;
-import javax.ejb.Stateless;
+import javax.ejb.Stateful;
-@Stateless
+@Stateful
public class MegaPoorHenHouse extends PoorHenHouse implements MegaPoorHenHouseLocal
{
private boolean postConstructCalledAfterSuperclassInitializer = false;
@@ -23,6 +23,7 @@
return postConstructCalledAfterSuperclassInitializer;
}
+ @Override
public boolean isInitializerCalledAfterSuperclassInjection()
{
return initializerCalledAfterSuperclassInjection;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java 2009-11-04 14:24:02 UTC (rev 4652)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java 2009-11-04 15:08:23 UTC (rev 4653)
@@ -5,10 +5,9 @@
class PoorHenHouse extends HenHouse
{
protected boolean initializerCalledAfterSuperclassInjection = false;
-
+
@Inject
- public void initialize()
- {
+ public void initialize() {
initializerCalledAfterSuperclassInjection = fox != null;
}
Copied: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java (from rev 4611, cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java)
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java 2009-11-04 15:08:23 UTC (rev 4653)
@@ -0,0 +1,53 @@
+/*
+ * 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 org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.test.audit.annotations.SpecAssertion;
+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.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.testng.annotations.Test;
+
+@Artifact
+@IntegrationTest
+(a)Packaging(PackagingType.EAR)
+@SpecVersion(spec="cdi", version="20091018")
+public class SessionBeanInjectionOrderingTest extends AbstractJSR299Test
+{
+
+ @Test
+ @SpecAssertion(section = "5.6.4", id = "bb")
+ public void testInitializerCalledAfterFieldInjectionOfSuperclass() {
+ MegaPoorHenHouseLocal house = getInstanceByType(MegaPoorHenHouseLocal.class);
+ assert house.isInitializerCalledAfterSuperclassInjection();
+ }
+
+ @Test
+ @SpecAssertion(section = "5.6.4", id = "bf")
+ public void testPostConstructCalledAfterInitializerOfSuperclass() {
+ assert getInstanceByType(MegaPoorHenHouseLocal.class).isPostConstructCalledAfterSuperclassInitializer();
+ }
+
+ @Test
+ @SpecAssertion(section = "5.6.4", id = "bc")
+ public void testInitializerCalledAfterResourceInjection() {
+ assert getInstanceByType(InjectedSessionBeanLocal.class).isInitializerCalledAfterResourceInjection();
+ }
+}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java 2009-11-04 14:24:02 UTC (rev 4652)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java 2009-11-04 15:08:23 UTC (rev 4653)
@@ -57,7 +57,7 @@
assert getInstanceByType(InjectedSessionBeanLocal.class).getFarm().isInjectionPerformedCorrectly();
}
- @Test(groups = "jboss-as-broken")
+ //@Test(groups = "jboss-as-broken")
@SpecAssertions({
@SpecAssertion(section = "5.6", id = "ed"),
@SpecAssertion(section = "5.6.4", id = "ao"),
@@ -89,23 +89,5 @@
assert henHouse.getFox() != null;
assert henHouse.getFox().getName().equals("gavin");
}
-
- @Test
- @SpecAssertion(section = "5.6.4", id = "bb")
- public void testInitializerCalledAfterFieldInjectionOfSuperclass() {
- MegaPoorHenHouseLocal house = getInstanceByType(MegaPoorHenHouseLocal.class);
- assert house.isInitializerCalledAfterSuperclassInjection();
- }
-
- @Test
- @SpecAssertion(section = "5.6.4", id = "bf")
- public void testPostConstructCalledAfterInitializerOfSuperclass() {
- assert getInstanceByType(MegaPoorHenHouseLocal.class).isPostConstructCalledAfterSuperclassInitializer();
- }
-
- @Test
- @SpecAssertion(section = "5.6.4", id = "bc")
- public void testInitializerCalledAfterResourceInjection() {
- assert getInstanceByType(InjectedSessionBeanLocal.class).isInitializerCalledAfterResourceInjection();
- }
+
}
16 years, 5 months
Weld SVN: r4652 - core/trunk/impl/src/main/java/org/jboss/weld/bootstrap.
by weld-commits＠lists.jboss.org
Author: peteroyle
Date: 2009-11-04 09:24:02 -0500 (Wed, 04 Nov 2009)
New Revision: 4652
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java
Log:
Arrays2.<Class<?>>asSet() --> Collections.EMPTY_SET
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2009-11-04 14:12:04 UTC (rev 4651)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2009-11-04 14:24:02 UTC (rev 4652)
@@ -127,7 +127,7 @@
private final ServiceRegistry serviceRegistry = new SimpleServiceRegistry();
private final Set<Class<?>> beanClasses = (deployment.getServices().contains(ServletServices.class))
? Arrays2.<Class<?>>asSet(ConversationImpl.class, ServletConversationManager.class, NumericConversationIdGenerator.class, HttpSessionManager.class)
- : Arrays2.<Class<?>>asSet();
+ : Collections.EMPTY_SET;
public ServiceRegistry getServices()
{
16 years, 5 months
Weld SVN: r4651 - core/trunk/impl/src/main/java/org/jboss/weld/bootstrap.
by weld-commits＠lists.jboss.org
Author: peteroyle
Date: 2009-11-04 09:12:04 -0500 (Wed, 04 Nov 2009)
New Revision: 4651
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java
Log:
Conditional inclusion of servlet classes depending on the requirements of the environment.
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2009-11-04 14:06:22 UTC (rev 4650)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2009-11-04 14:12:04 UTC (rev 4651)
@@ -78,6 +78,7 @@
import org.jboss.weld.serialization.spi.ContextualStore;
import org.jboss.weld.servlet.HttpSessionManager;
import org.jboss.weld.servlet.ServletApiAbstraction;
+import org.jboss.weld.servlet.api.ServletServices;
import org.jboss.weld.transaction.spi.TransactionServices;
import org.jboss.weld.util.Names;
import org.jboss.weld.util.collections.Arrays2;
@@ -114,7 +115,7 @@
private final Map<BeanDeploymentArchive, BeanDeployment> managerAwareBeanDeploymentArchives;
private final BeanDeploymentArchive implementationBeanDeploymentArchive;
- public DeploymentVisitor(BeanManagerImpl deploymentManager, Environment environment, Deployment deployment)
+ public DeploymentVisitor(BeanManagerImpl deploymentManager, Environment environment, final Deployment deployment)
{
this.deploymentManager = deploymentManager;
this.environment = environment;
@@ -124,7 +125,9 @@
{
private final ServiceRegistry serviceRegistry = new SimpleServiceRegistry();
- private final Set<Class<?>> beanClasses = Arrays2.<Class<?>>asSet(ConversationImpl.class, ServletConversationManager.class, NumericConversationIdGenerator.class, HttpSessionManager.class);
+ private final Set<Class<?>> beanClasses = (deployment.getServices().contains(ServletServices.class))
+ ? Arrays2.<Class<?>>asSet(ConversationImpl.class, ServletConversationManager.class, NumericConversationIdGenerator.class, HttpSessionManager.class)
+ : Arrays2.<Class<?>>asSet();
public ServiceRegistry getServices()
{
16 years, 5 months
Weld SVN: r4650 - extensions/trunk/se.
by weld-commits＠lists.jboss.org
Author: peteroyle
Date: 2009-11-04 09:06:22 -0500 (Wed, 04 Nov 2009)
New Revision: 4650
Modified:
extensions/trunk/se/pom.xml
Log:
using slf4j simple logger
Modified: extensions/trunk/se/pom.xml
===================================================================
--- extensions/trunk/se/pom.xml 2009-11-04 13:45:29 UTC (rev 4649)
+++ extensions/trunk/se/pom.xml 2009-11-04 14:06:22 UTC (rev 4650)
@@ -78,9 +78,8 @@
<artifactId>jsr250-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.slf4j</groupId>
- <artifactId>slf4j-jboss-logging</artifactId>
- <version>1.0.2.GA</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
</dependency>
</dependencies>
16 years, 5 months
Weld SVN: r4649 - in extensions/trunk/se: src/main/java/org/jboss/weld/environment/se and 1 other directories.
by weld-commits＠lists.jboss.org
Author: peteroyle
Date: 2009-11-04 08:45:29 -0500 (Wed, 04 Nov 2009)
New Revision: 4649
Modified:
extensions/trunk/se/pom.xml
extensions/trunk/se/src/main/java/org/jboss/weld/environment/se/ShutdownManager.java
extensions/trunk/se/src/main/java/org/jboss/weld/environment/se/discovery/AbstractScanner.java
extensions/trunk/se/src/main/java/org/jboss/weld/environment/se/discovery/URLScanner.java
Log:
Switched to slf4j logging provider.
Modified: extensions/trunk/se/pom.xml
===================================================================
--- extensions/trunk/se/pom.xml 2009-11-04 13:35:22 UTC (rev 4648)
+++ extensions/trunk/se/pom.xml 2009-11-04 13:45:29 UTC (rev 4649)
@@ -77,8 +77,14 @@
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.jboss.slf4j</groupId>
+ <artifactId>slf4j-jboss-logging</artifactId>
+ <version>1.0.2.GA</version>
+ </dependency>
</dependencies>
</project>
+
+
Modified: extensions/trunk/se/src/main/java/org/jboss/weld/environment/se/ShutdownManager.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/weld/environment/se/ShutdownManager.java 2009-11-04 13:35:22 UTC (rev 4648)
+++ extensions/trunk/se/src/main/java/org/jboss/weld/environment/se/ShutdownManager.java 2009-11-04 13:45:29 UTC (rev 4649)
@@ -20,17 +20,16 @@
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.BeanManager;
import javax.inject.Inject;
-
import org.jboss.weld.bootstrap.api.Bootstrap;
import org.jboss.weld.environment.se.events.Shutdown;
-import org.jboss.weld.log.LogProvider;
-import org.jboss.weld.log.Logging;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@ApplicationScoped
public class ShutdownManager
{
- private static LogProvider log = Logging.getLogProvider(ShutdownManager.class);
+ private static Logger log = LoggerFactory.getLogger(ShutdownManager.class);
@Inject
private BeanManager manager;
@@ -58,7 +57,8 @@
else
{
log.debug("Skipping spurious call to shutdown");
- log.trace(Thread.currentThread().getStackTrace());
+ log.trace("Spurious call to shutdown located at: ",
+ Thread.currentThread().getStackTrace());
}
}
}
Modified: extensions/trunk/se/src/main/java/org/jboss/weld/environment/se/discovery/AbstractScanner.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/weld/environment/se/discovery/AbstractScanner.java 2009-11-04 13:35:22 UTC (rev 4648)
+++ extensions/trunk/se/src/main/java/org/jboss/weld/environment/se/discovery/AbstractScanner.java 2009-11-04 13:45:29 UTC (rev 4649)
@@ -17,10 +17,9 @@
package org.jboss.weld.environment.se.discovery;
import java.net.URL;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import org.jboss.weld.log.LogProvider;
-import org.jboss.weld.log.Logging;
-
/**
* Abstract base class for {@link Scanner} providing common functionality
*
@@ -32,7 +31,7 @@
public abstract class AbstractScanner implements Scanner
{
- private static final LogProvider log = Logging.getLogProvider(Scanner.class);
+ private static final Logger log = LoggerFactory.getLogger(Scanner.class);
private final ClassLoader classLoader;
private final SEWeldDiscovery webBeanDiscovery;
Modified: extensions/trunk/se/src/main/java/org/jboss/weld/environment/se/discovery/URLScanner.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/weld/environment/se/discovery/URLScanner.java 2009-11-04 13:35:22 UTC (rev 4648)
+++ extensions/trunk/se/src/main/java/org/jboss/weld/environment/se/discovery/URLScanner.java 2009-11-04 13:45:29 UTC (rev 4649)
@@ -29,8 +29,8 @@
import java.util.zip.ZipException;
import java.util.zip.ZipFile;
-import org.jboss.weld.log.LogProvider;
-import org.jboss.weld.log.Logging;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Implementation of {@link Scanner} which can scan a {@link URLClassLoader}
@@ -43,7 +43,7 @@
*/
public class URLScanner extends AbstractScanner
{
- private static final LogProvider log = Logging.getLogProvider(URLScanner.class);
+ private static final Logger log = LoggerFactory.getLogger(URLScanner.class);
public URLScanner(ClassLoader classLoader, SEWeldDiscovery webBeanDiscovery)
{
16 years, 5 months
Weld SVN: r4648 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-04 08:35:22 -0500 (Wed, 04 Nov 2009)
New Revision: 4648
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java
Log:
ws
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java 2009-11-04 11:24:34 UTC (rev 4647)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java 2009-11-04 13:35:22 UTC (rev 4648)
@@ -5,9 +5,10 @@
class PoorHenHouse extends HenHouse
{
protected boolean initializerCalledAfterSuperclassInjection = false;
-
+
@Inject
- public void initialize() {
+ public void initialize()
+ {
initializerCalledAfterSuperclassInjection = fox != null;
}
16 years, 5 months