Weld SVN: r5669 - examples/trunk.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-29 14:24:09 -0500 (Fri, 29 Jan 2010)
New Revision: 5669
Modified:
examples/trunk/pom.xml
Log:
split out extension versions
Modified: examples/trunk/pom.xml
===================================================================
--- examples/trunk/pom.xml 2010-01-29 19:23:11 UTC (rev 5668)
+++ examples/trunk/pom.xml 2010-01-29 19:24:09 UTC (rev 5669)
@@ -89,8 +89,9 @@
<properties>
<jsf.version>2.0.0-RC</jsf.version>
<weld.api.version>1.0</weld.api.version>
- <weld.core.version>1.0.0</weld.core.version>
- <weld.extensions.version>1.0.0-CR2</weld.extensions.version>
+ <weld.wicket.version>1.0.1-SNAPSHOT</weld.wicket.version>
+ <weld.se.version>1.0.1-SNAPSHOT</weld.se.version>
+ <weld.servlet.version>1.0.1-SNAPSHOT</weld.servlet.version>
<jetty.version>6.1.21</jetty.version>
<uel.glassfish.version>2.1.2-b04</uel.glassfish.version>
<!-- Testing deps -->
@@ -173,21 +174,19 @@
<type>pom</type>
<scope>import</scope>
</dependency>
-
+
<dependency>
<groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-bom</artifactId>
- <version>${weld.core.version}</version>
+ <artifactId>weld-wicket</artifactId>
+ <version>${weld.wicket.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>
+ <artifactId>weld-wicket</artifactId>
+ <version>${weld.wicket.version}</version>
</dependency>
<dependency>
14 years, 3 months
Weld SVN: r5668 - wicket/trunk.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-29 14:23:11 -0500 (Fri, 29 Jan 2010)
New Revision: 5668
Modified:
wicket/trunk/pom.xml
Log:
update version number, move stuff around, ws
Modified: wicket/trunk/pom.xml
===================================================================
--- wicket/trunk/pom.xml 2010-01-29 18:48:21 UTC (rev 5667)
+++ wicket/trunk/pom.xml 2010-01-29 19:23:11 UTC (rev 5668)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
@@ -7,7 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-wicket</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<name>Weld Wicket support</name>
<description>Weld support for Apache Wicket</description>
@@ -33,7 +34,7 @@
<wicket.version>1.4.1</wicket.version>
</properties>
- <!-- Import the BOMs -->
+ <!-- Import the BOMs -->
<dependencyManagement>
<dependencies>
<dependency>
@@ -50,6 +51,11 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -67,36 +73,35 @@
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core</artifactId>
<scope>provided</scope>
</dependency>
-
+
<!-- WELDX-36 -->
<dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
<version>1.0</version>
</dependency>
-
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket</artifactId>
- <version>${wicket.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket</artifactId>
+ </dependency>
</dependencies>
14 years, 3 months
Weld SVN: r5667 - wicket/trunk/src/main/java/org/jboss/weld/wicket.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-29 13:48:21 -0500 (Fri, 29 Jan 2010)
New Revision: 5667
Modified:
wicket/trunk/src/main/java/org/jboss/weld/wicket/WeldRequestCycle.java
Log:
ws
Modified: wicket/trunk/src/main/java/org/jboss/weld/wicket/WeldRequestCycle.java
===================================================================
--- wicket/trunk/src/main/java/org/jboss/weld/wicket/WeldRequestCycle.java 2010-01-29 18:39:21 UTC (rev 5666)
+++ wicket/trunk/src/main/java/org/jboss/weld/wicket/WeldRequestCycle.java 2010-01-29 18:48:21 UTC (rev 5667)
@@ -82,13 +82,11 @@
}
BeanManager manager = BeanManagerLookup.getBeanManager();
-
- ConversationImpl conversation = (ConversationImpl) getInstanceByType(manager,
- Conversation.class);
+ ConversationImpl conversation = (ConversationImpl) getInstanceByType(manager, Conversation.class);
+
// restore a conversation if it exists and we aren't already in it
- if (specifiedCid != null
- && (conversation == null || !specifiedCid.equals(conversation.getUnderlyingId())))
+ if (specifiedCid != null && (conversation == null || !specifiedCid.equals(conversation.getUnderlyingId())))
{
getInstanceByType(manager, ConversationManager.class).beginOrRestoreConversation(specifiedCid);
}
@@ -118,13 +116,11 @@
}
}
- ConversationContext conversationContext = Container.instance().services().get(
- ContextLifecycle.class).getConversationContext();
+ ConversationContext conversationContext = Container.instance().services().get(ContextLifecycle.class).getConversationContext();
// Now set up the conversational context if it isn't already
if (!conversationContext.isActive())
{
- conversationContext.setBeanStore(new ConversationBeanStore(((WebRequest) request)
- .getHttpServletRequest().getSession(), conversation.getUnderlyingId()));
+ conversationContext.setBeanStore(new ConversationBeanStore(((WebRequest) request).getHttpServletRequest().getSession(), conversation.getUnderlyingId()));
conversationContext.setActive(true);
}
}
@@ -148,18 +144,16 @@
}
return beans.iterator().next();
}
-
+
@Override
public void detach()
{
super.detach();
- ConversationContext conversationContext = Container.instance().services().get(
- ContextLifecycle.class).getConversationContext();
+ ConversationContext conversationContext = Container.instance().services().get(ContextLifecycle.class).getConversationContext();
// cleanup and deactivate the conversation context
if (conversationContext.isActive())
{
- ConversationManager conversationManager = getInstanceByType(BeanManagerLookup
- .getBeanManager(), ConversationManager.class);
+ ConversationManager conversationManager = getInstanceByType(BeanManagerLookup.getBeanManager(), ConversationManager.class);
conversationManager.cleanupConversation();
conversationContext.setActive(false);
}
14 years, 3 months
Weld SVN: r5666 - wicket/trunk/src/main/java.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-29 13:39:21 -0500 (Fri, 29 Jan 2010)
New Revision: 5666
Removed:
wicket/trunk/src/main/java/META-INF/
Log:
oops
14 years, 3 months
Weld SVN: r5665 - in wicket/trunk: src/main/java and 2 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-29 13:37:40 -0500 (Fri, 29 Jan 2010)
New Revision: 5665
Added:
wicket/trunk/src/main/java/META-INF/
wicket/trunk/src/main/java/META-INF/MANIFEST.MF
Modified:
wicket/trunk/
wicket/trunk/pom.xml
wicket/trunk/src/main/java/org/jboss/weld/wicket/WeldRequestCycle.java
Log:
ignores
Property changes on: wicket/trunk
___________________________________________________________________
Name: svn:ignore
+ target
.settings
.classpath
.project
Modified: wicket/trunk/pom.xml
===================================================================
--- wicket/trunk/pom.xml 2010-01-29 18:36:58 UTC (rev 5664)
+++ wicket/trunk/pom.xml 2010-01-29 18:37:40 UTC (rev 5665)
@@ -28,7 +28,7 @@
<properties>
<weld.api.version>1.0</weld.api.version>
- <weld.core.version>1.0.0</weld.core.version>
+ <weld.core.version>1.0.1-SNAPSHOT</weld.core.version>
<testng.version>5.10</testng.version>
<wicket.version>1.4.1</wicket.version>
</properties>
Added: wicket/trunk/src/main/java/META-INF/MANIFEST.MF
===================================================================
--- wicket/trunk/src/main/java/META-INF/MANIFEST.MF (rev 0)
+++ wicket/trunk/src/main/java/META-INF/MANIFEST.MF 2010-01-29 18:37:40 UTC (rev 5665)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: wicket/trunk/src/main/java/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: wicket/trunk/src/main/java/org/jboss/weld/wicket/WeldRequestCycle.java
===================================================================
--- wicket/trunk/src/main/java/org/jboss/weld/wicket/WeldRequestCycle.java 2010-01-29 18:36:58 UTC (rev 5664)
+++ wicket/trunk/src/main/java/org/jboss/weld/wicket/WeldRequestCycle.java 2010-01-29 18:37:40 UTC (rev 5665)
@@ -74,7 +74,7 @@
String specifiedCid = null;
if (page != null)
{
- specifiedCid = (String) page.getMetaData(WeldMetaData.CID);
+ specifiedCid = page.getMetaData(WeldMetaData.CID);
}
else
{
@@ -118,7 +118,7 @@
}
}
- ConversationContext conversationContext = Container.instance().deploymentServices().get(
+ ConversationContext conversationContext = Container.instance().services().get(
ContextLifecycle.class).getConversationContext();
// Now set up the conversational context if it isn't already
if (!conversationContext.isActive())
@@ -153,7 +153,7 @@
public void detach()
{
super.detach();
- ConversationContext conversationContext = Container.instance().deploymentServices().get(
+ ConversationContext conversationContext = Container.instance().services().get(
ContextLifecycle.class).getConversationContext();
// cleanup and deactivate the conversation context
if (conversationContext.isActive())
14 years, 3 months
Weld SVN: r5664 - java-se/trunk.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-29 13:36:58 -0500 (Fri, 29 Jan 2010)
New Revision: 5664
Modified:
java-se/trunk/
Log:
ignores
Property changes on: java-se/trunk
___________________________________________________________________
Name: svn:ignore
- target
.classpath
.settings
.project
+ target
.classpath
.settings
.project
test-output
14 years, 3 months
Weld SVN: r5663 - examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-29 13:36:08 -0500 (Fri, 29 Jan 2010)
New Revision: 5663
Modified:
examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/web.xml
Log:
oops
Modified: examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/web.xml
===================================================================
--- examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/web.xml 2010-01-29 11:42:38 UTC (rev 5662)
+++ examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/web.xml 2010-01-29 18:36:08 UTC (rev 5663)
@@ -16,10 +16,6 @@
<param-value>org.jboss.weld.examples.wicket.NumberGuessApplication</param-value>
</init-param>
</filter>
-
- <listener>
- <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class>
- </listener>
<filter-mapping>
<filter-name>Wicket Filter</filter-name>
14 years, 3 months
Weld SVN: r5662 - examples/trunk.
by weld-commits＠lists.jboss.org
Author: mgencur(a)redhat.com
Date: 2010-01-29 06:42:38 -0500 (Fri, 29 Jan 2010)
New Revision: 5662
Modified:
examples/trunk/pom.xml
Log:
removed logging to file
Modified: examples/trunk/pom.xml
===================================================================
--- examples/trunk/pom.xml 2010-01-29 10:35:19 UTC (rev 5661)
+++ examples/trunk/pom.xml 2010-01-29 11:42:38 UTC (rev 5662)
@@ -366,7 +366,6 @@
<background>true</background>
<port>${selenium.server.port}</port>
<logOutput>true</logOutput>
- <logFile>${project.build.directory}/selenium/selenium-server.log</logFile>
<browserSideLog>${selenium.debug}</browserSideLog>
<debug>${selenium.debug}</debug>
</configuration>
14 years, 3 months
Weld SVN: r5661 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order.
by weld-commits＠lists.jboss.org
Author: jharting
Date: 2010-01-29 05:35:19 -0500 (Fri, 29 Jan 2010)
New Revision: 5661
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor3.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor4.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/LakeCargoShip.java
Log:
Test also lifecycle callback interceptors defined on an interceptor superclasses
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor3.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor3.java 2010-01-29 07:50:35 UTC (rev 5660)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor3.java 2010-01-29 10:35:19 UTC (rev 5661)
@@ -19,7 +19,7 @@
import javax.annotation.PostConstruct;
import javax.interceptor.InvocationContext;
-class Interceptor3
+class Interceptor3 extends Interceptor2
{
@PostConstruct
void postConstruct3(InvocationContext ctx)
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor4.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor4.java 2010-01-29 07:50:35 UTC (rev 5660)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor4.java 2010-01-29 10:35:19 UTC (rev 5661)
@@ -19,7 +19,7 @@
import javax.annotation.PostConstruct;
import javax.interceptor.InvocationContext;
-class Interceptor4
+class Interceptor4 extends Interceptor3
{
@PostConstruct
void postConstruct(InvocationContext ctx)
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/LakeCargoShip.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/LakeCargoShip.java 2010-01-29 07:50:35 UTC (rev 5660)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/LakeCargoShip.java 2010-01-29 10:35:19 UTC (rev 5661)
@@ -19,7 +19,7 @@
import javax.annotation.PostConstruct;
import javax.interceptor.Interceptors;
-@Interceptors( { Interceptor1.class, Interceptor2.class, Interceptor3.class, Interceptor4.class })
+@Interceptors( { Interceptor1.class, Interceptor4.class })
class LakeCargoShip extends CargoShip
{
// Every interceptor sets this property to a certain value.
14 years, 3 months
Weld SVN: r5660 - in core/trunk: jboss-tck-runner/src/test/debug-resources/META-INF and 1 other directories.
by weld-commits＠lists.jboss.org
Author: marius.bogoevici
Date: 2010-01-29 02:50:35 -0500 (Fri, 29 Jan 2010)
New Revision: 5660
Modified:
core/trunk/bom/pom.xml
core/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties
core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml
Log:
WELD-393: upgrading to interceptors CR10
Modified: core/trunk/bom/pom.xml
===================================================================
--- core/trunk/bom/pom.xml 2010-01-28 22:44:46 UTC (rev 5659)
+++ core/trunk/bom/pom.xml 2010-01-29 07:50:35 UTC (rev 5660)
@@ -76,7 +76,7 @@
<javassist.version>3.11.0.GA</javassist.version>
<cdi.tck.version>1.0.1-CR1</cdi.tck.version>
<atinject.tck.version>1.0.0-PFD-3</atinject.tck.version>
- <jboss.interceptor.version>1.0.0-CR9</jboss.interceptor.version>
+ <jboss.interceptor.version>1.0.0-CR10</jboss.interceptor.version>
<slf4j.version>1.5.10</slf4j.version>
<cal10n.version>0.7.2</cal10n.version>
</properties>
Modified: core/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties
===================================================================
--- core/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties 2010-01-28 22:44:46 UTC (rev 5659)
+++ core/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties 2010-01-29 07:50:35 UTC (rev 5660)
@@ -1,7 +1,12 @@
# Configuration for running incontainer tests from your IDE
-# Alter the path weld accordingly (relative from the tck/impl dir)
+# Alter the path webbeans accordingly (relative from the tck/impl dir)
org.jboss.testharness.standalone=false
-org.jboss.testharness.container.extraConfigurationDir=../../weld/jboss-as
+org.jboss.testharness.container.extraConfigurationDir=/Users/marius/Work/jboss/weld/core/jboss-as
org.jboss.testharness.container.forceRestart=false
-org.jboss.testharness.libraryDirectory=../../weld/jboss-tck-runner/target/dependency/lib
+org.jboss.testharness.libraryDirectory=/Users/marius/Work/jboss/weld/core/jboss-tck-runner/target/dependency/lib
org.jboss.testharness.runIntegrationTests=true
+#jboss.home=/opt/jboss/jboss-6.0.0-SNAPSHOT
+jboss.home=/opt/jboss/jboss-6.0.0.M1
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
Modified: core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml
===================================================================
--- core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml 2010-01-28 22:44:46 UTC (rev 5659)
+++ core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml 2010-01-29 07:50:35 UTC (rev 5660)
@@ -16,43 +16,21 @@
<classes>
<!-- Issues in Weld (the RI) -->
-
- <!-- WELD-393 -->
- <class name="org.jboss.jsr299.tck.interceptors.tests.definition.DefinitionTest">
- <methods>
- <exclude name="testInterceptorMethodDefinedOnTargetClass" />
- </methods>
- </class>
-
- <!-- WELD-390 -->
+
+ <!-- WELD-390 fixed, but TCK test is broken in 1.0.1-CR1 -->
<class name="org.jboss.jsr299.tck.interceptors.tests.lifecycleCallback.order.InvocationOrderTest">
<methods>
<exclude name="testInvocationOrder" />
</methods>
</class>
+
<!-- WELD-269 -->
<class name="org.jboss.jsr299.tck.tests.decorators.custom.CustomDecoratorTest">
<methods>
<exclude name="testCustomImplementationOfDecoratorInterface" />
</methods>
</class>
- <!-- WELD-272 -->
- <class name="org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanClass.FinalBeanClassTest">
- <methods>
- <exclude name="testAppliesToFinalManagedBeanClass" />
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanMethod.FinalBeanMethodTest">
- <methods>
- <exclude name="testAppliesToFinalMethodOnManagedBeanClass" />
- </methods>
- </class>
- <!-- WELD-377 -->
- <class name="org.jboss.jsr299.tck.tests.decorators.invocation.EJBDecoratorInvocationTest">
- <methods>
- <exclude name="testEJBDecoratorInvocation" />
- </methods>
- </class>
+
<!-- WELD-401 -->
<class name="org.jboss.jsr299.tck.tests.event.broken.observer.notBusinessMethod.EJBObserverMethodNotBusinessMethodTest">
<methods>
14 years, 3 months