[webbeans-commits] Webbeans SVN: r3510 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-16 05:43:33 -0400 (Sun, 16 Aug 2009)
New Revision: 3510
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java
Log:
Fix test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java 2009-08-16 09:42:55 UTC (rev 3509)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java 2009-08-16 09:43:33 UTC (rev 3510)
@@ -272,13 +272,12 @@
assert houseKeeping.getItemsMissing().iterator().next() == crackers;
}
- @Test(groups = {"events", "broken"}, expectedExceptions = IllegalArgumentException.class)
+ @Test(groups = {"events"}, expectedExceptions = IllegalArgumentException.class)
@SpecAssertion(section = "10.3.1", id = "f")
- //TODO There does not seem to be any way to write code that compiles and tests this assertion
- public void testEventFireThrowsExceptionIfEventObjectContainsTypeVariable()
+ public <T> void testEventFireThrowsExceptionIfEventObjectContainsTypeVariable()
{
MiniBar miniBar = getInstanceByType(MiniBar.class);
- miniBar.itemEvent.fire(new Item_Illegal<Integer>("12 oz Beer", 5.50));
+ miniBar.itemEvent.fire(new Item_Illegal<T>("12 oz Beer", 5.50));
}
}
16 years, 8 months
[webbeans-commits] Webbeans SVN: r3509 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-16 05:42:55 -0400 (Sun, 16 Aug 2009)
New Revision: 3509
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java
Log:
Change from broken -> rewrite
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java 2009-08-15 14:05:42 UTC (rev 3508)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java 2009-08-16 09:42:55 UTC (rev 3509)
@@ -20,7 +20,7 @@
@SpecVersion("20090625")
public class EJBApplicationContextTest extends AbstractJSR299Test
{
- @Test(groups = { "broken", "contexts", "webservice", "integration", "jboss-as-broken" })
+ @Test(groups = { "rewrite", "contexts", "webservice", "integration", "jboss-as-broken" })
@SpecAssertion(section = "6.7.3", id = "b")
public void testApplicationScopeActiveDuringWebServiceInvocation()
{
16 years, 8 months
[webbeans-commits] Webbeans SVN: r3508 - in examples/trunk/se/hello-world/src: main/java/org/jboss/webbeans/environment/se/example/simple and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: peteroyle
Date: 2009-08-15 10:05:42 -0400 (Sat, 15 Aug 2009)
New Revision: 3508
Modified:
examples/trunk/se/hello-world/src/etc/header.txt
examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/CommandLineArgsValidator.java
examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/HelloWorld.java
examples/trunk/se/hello-world/src/main/resources/META-INF/beans.xml
examples/trunk/se/hello-world/src/main/resources/log4j.properties
Log:
Updated licence text: They currently read "Copyright <Year>, Red Hat Middleware LLC," when in fact they should read "Copyright <Year>, Red Hat, Inc. and/or its affiliates,".
Modified: examples/trunk/se/hello-world/src/etc/header.txt
===================================================================
--- examples/trunk/se/hello-world/src/etc/header.txt 2009-08-15 14:05:27 UTC (rev 3507)
+++ examples/trunk/se/hello-world/src/etc/header.txt 2009-08-15 14:05:42 UTC (rev 3508)
@@ -1,7 +1,7 @@
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.
+Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.
Modified: examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/CommandLineArgsValidator.java
===================================================================
--- examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/CommandLineArgsValidator.java 2009-08-15 14:05:27 UTC (rev 3507)
+++ examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/CommandLineArgsValidator.java 2009-08-15 14:05:42 UTC (rev 3508)
@@ -1,8 +1,8 @@
/**
* 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.
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.
Modified: examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/HelloWorld.java
===================================================================
--- examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/HelloWorld.java 2009-08-15 14:05:27 UTC (rev 3507)
+++ examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/HelloWorld.java 2009-08-15 14:05:42 UTC (rev 3508)
@@ -1,8 +1,8 @@
/**
* 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.
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.
Modified: examples/trunk/se/hello-world/src/main/resources/META-INF/beans.xml
===================================================================
--- examples/trunk/se/hello-world/src/main/resources/META-INF/beans.xml 2009-08-15 14:05:27 UTC (rev 3507)
+++ examples/trunk/se/hello-world/src/main/resources/META-INF/beans.xml 2009-08-15 14:05:42 UTC (rev 3508)
@@ -1,9 +1,9 @@
<!--
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.
+ Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.
Modified: examples/trunk/se/hello-world/src/main/resources/log4j.properties
===================================================================
--- examples/trunk/se/hello-world/src/main/resources/log4j.properties 2009-08-15 14:05:27 UTC (rev 3507)
+++ examples/trunk/se/hello-world/src/main/resources/log4j.properties 2009-08-15 14:05:42 UTC (rev 3508)
@@ -1,8 +1,8 @@
#
# 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.
+# Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.
16 years, 8 months
[webbeans-commits] Webbeans SVN: r3507 - in examples/trunk/se/numberguess: src and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: peteroyle
Date: 2009-08-15 10:05:27 -0400 (Sat, 15 Aug 2009)
New Revision: 3507
Added:
examples/trunk/se/numberguess/src/etc/
examples/trunk/se/numberguess/src/etc/header.txt
Modified:
examples/trunk/se/numberguess/readme.txt
examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java
examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java
examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java
examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java
examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java
examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Random.java
Log:
Updated licence text: They currently read "Copyright <Year>, Red Hat Middleware LLC," when in fact they should read "Copyright <Year>, Red Hat, Inc. and/or its affiliates,".
Modified: examples/trunk/se/numberguess/readme.txt
===================================================================
--- examples/trunk/se/numberguess/readme.txt 2009-08-15 14:04:58 UTC (rev 3506)
+++ examples/trunk/se/numberguess/readme.txt 2009-08-15 14:05:27 UTC (rev 3507)
@@ -1,3 +1,19 @@
+====
+ JBoss, Home of Professional Open Source
+ Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.
+====
===================
Swing Example: Number Guess
===================
Added: examples/trunk/se/numberguess/src/etc/header.txt
===================================================================
--- examples/trunk/se/numberguess/src/etc/header.txt (rev 0)
+++ examples/trunk/se/numberguess/src/etc/header.txt 2009-08-15 14:05:27 UTC (rev 3507)
@@ -0,0 +1,14 @@
+JBoss, Home of Professional Open Source
+Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java 2009-08-15 14:04:58 UTC (rev 3506)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java 2009-08-15 14:05:27 UTC (rev 3507)
@@ -1,8 +1,8 @@
/**
* 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.
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java 2009-08-15 14:04:58 UTC (rev 3506)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java 2009-08-15 14:05:27 UTC (rev 3507)
@@ -1,8 +1,8 @@
/**
* 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.
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java 2009-08-15 14:04:58 UTC (rev 3506)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java 2009-08-15 14:05:27 UTC (rev 3507)
@@ -1,8 +1,8 @@
/**
* 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.
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java 2009-08-15 14:04:58 UTC (rev 3506)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java 2009-08-15 14:05:27 UTC (rev 3507)
@@ -1,8 +1,8 @@
/**
* 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.
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java 2009-08-15 14:04:58 UTC (rev 3506)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java 2009-08-15 14:05:27 UTC (rev 3507)
@@ -1,8 +1,8 @@
/**
* 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.
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Random.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Random.java 2009-08-15 14:04:58 UTC (rev 3506)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Random.java 2009-08-15 14:05:27 UTC (rev 3507)
@@ -1,8 +1,8 @@
/**
* 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.
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.
16 years, 8 months
[webbeans-commits] Webbeans SVN: r3506 - in extensions/trunk/se/src: main/java/org/jboss/webbeans/environment/se and 5 other directories.
by webbeans-commits＠lists.jboss.org
Author: peteroyle
Date: 2009-08-15 10:04:58 -0400 (Sat, 15 Aug 2009)
New Revision: 3506
Modified:
extensions/trunk/se/src/etc/header.txt
extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java
extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java
extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/Parameters.java
extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/Reflections.java
extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/WebBeansManagerUtils.java
extensions/trunk/se/src/main/resources/META-INF/beans.xml
extensions/trunk/se/src/main/resources/beans.xml
extensions/trunk/se/src/main/resources/log4j.xml
Log:
Updated licence text: They currently read "Copyright <Year>, Red Hat Middleware LLC," when in fact they should read "Copyright <Year>, Red Hat, Inc. and/or its affiliates,".
Modified: extensions/trunk/se/src/etc/header.txt
===================================================================
--- extensions/trunk/se/src/etc/header.txt 2009-08-15 11:25:00 UTC (rev 3505)
+++ extensions/trunk/se/src/etc/header.txt 2009-08-15 14:04:58 UTC (rev 3506)
@@ -1,7 +1,7 @@
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.
+Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.
Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java 2009-08-15 11:25:00 UTC (rev 3505)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java 2009-08-15 14:04:58 UTC (rev 3506)
@@ -1,8 +1,8 @@
/**
* 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.
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.
Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java 2009-08-15 11:25:00 UTC (rev 3505)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java 2009-08-15 14:04:58 UTC (rev 3506)
@@ -1,8 +1,8 @@
/**
* 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.
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.
Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/Parameters.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/Parameters.java 2009-08-15 11:25:00 UTC (rev 3505)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/Parameters.java 2009-08-15 14:04:58 UTC (rev 3506)
@@ -1,8 +1,8 @@
/**
* 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.
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.
Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/Reflections.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/Reflections.java 2009-08-15 11:25:00 UTC (rev 3505)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/Reflections.java 2009-08-15 14:04:58 UTC (rev 3506)
@@ -1,8 +1,8 @@
/**
* 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.
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.
Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/WebBeansManagerUtils.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/WebBeansManagerUtils.java 2009-08-15 11:25:00 UTC (rev 3505)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/WebBeansManagerUtils.java 2009-08-15 14:04:58 UTC (rev 3506)
@@ -1,8 +1,8 @@
/**
* 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.
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.
Modified: extensions/trunk/se/src/main/resources/META-INF/beans.xml
===================================================================
--- extensions/trunk/se/src/main/resources/META-INF/beans.xml 2009-08-15 11:25:00 UTC (rev 3505)
+++ extensions/trunk/se/src/main/resources/META-INF/beans.xml 2009-08-15 14:04:58 UTC (rev 3506)
@@ -1,9 +1,9 @@
<!--
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.
+ Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.
Modified: extensions/trunk/se/src/main/resources/beans.xml
===================================================================
--- extensions/trunk/se/src/main/resources/beans.xml 2009-08-15 11:25:00 UTC (rev 3505)
+++ extensions/trunk/se/src/main/resources/beans.xml 2009-08-15 14:04:58 UTC (rev 3506)
@@ -1,9 +1,9 @@
<!--
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.
+ Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.
Modified: extensions/trunk/se/src/main/resources/log4j.xml
===================================================================
--- extensions/trunk/se/src/main/resources/log4j.xml 2009-08-15 11:25:00 UTC (rev 3505)
+++ extensions/trunk/se/src/main/resources/log4j.xml 2009-08-15 14:04:58 UTC (rev 3506)
@@ -1,5 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!--
+ JBoss, Home of Professional Open Source
+ Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.
+
+-->
+
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
16 years, 8 months
[webbeans-commits] Webbeans SVN: r3505 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-15 07:25:00 -0400 (Sat, 15 Aug 2009)
New Revision: 3505
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
Log:
WBRI-363
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-08-15 11:03:12 UTC (rev 3504)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-08-15 11:25:00 UTC (rev 3505)
@@ -1314,7 +1314,7 @@
public boolean isBindingType(Class<? extends Annotation> annotationType)
{
- throw new UnsupportedOperationException("Not yet implemented");
+ return getServices().get(MetaAnnotationStore.class).getBindingTypeModel(annotationType).isValid();
}
public boolean isInterceptorBindingType(Class<? extends Annotation> annotationType)
@@ -1324,12 +1324,12 @@
public boolean isScopeType(Class<? extends Annotation> annotationType)
{
- throw new UnsupportedOperationException("Not yet implemented");
+ return getServices().get(MetaAnnotationStore.class).getScopeModel(annotationType).isValid();
}
public boolean isStereotype(Class<? extends Annotation> annotationType)
{
- throw new UnsupportedOperationException("Not yet implemented");
+ return getServices().get(MetaAnnotationStore.class).getStereotype(annotationType).isValid();
}
public ELResolver getELResolver()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-08-15 11:03:12 UTC (rev 3504)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-08-15 11:25:00 UTC (rev 3505)
@@ -101,28 +101,25 @@
getCurrentManager().validate(injectionPoint);
}
- @Test(groups = "ri-broken")
+ @Test
@SpecAssertion(section = "11.3.14", id = "aa")
- // WBRI-363
public void testDetermineBindingType()
{
assert getCurrentManager().isBindingType(Tame.class);
}
- @Test(groups = "ri-broken")
+ @Test()
@SpecAssertion(section = "11.3.14", id = "ab")
- // WBRI-363
public void testDetermineScopeType()
{
assert getCurrentManager().isScopeType(ApplicationScoped.class);
}
- @Test(groups = "ri-broken")
+ @Test
@SpecAssertion(section = "11.3.14", id = "ac")
- // WBRI-363
public void testDetermineStereotype()
{
- assert getCurrentManager().isBindingType(AnimalStereotype.class);
+ assert getCurrentManager().isStereotype(AnimalStereotype.class);
}
@Test(groups = "ri-broken")
16 years, 8 months
[webbeans-commits] Webbeans SVN: r3504 - doc/trunk/reference/en-US.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-15 07:03:12 -0400 (Sat, 15 Aug 2009)
New Revision: 3504
Modified:
doc/trunk/reference/en-US/Author_Group.xml
Log:
fix Red Hat Middleware LLC -> Red Hat Inc
Modified: doc/trunk/reference/en-US/Author_Group.xml
===================================================================
--- doc/trunk/reference/en-US/Author_Group.xml 2009-08-15 11:01:36 UTC (rev 3503)
+++ doc/trunk/reference/en-US/Author_Group.xml 2009-08-15 11:03:12 UTC (rev 3504)
@@ -6,7 +6,7 @@
<surname>King</surname>
<affiliation>
<jobtitle>JSR-299 specification lead</jobtitle>
- <orgname>Red Hat Middleware LLC</orgname>
+ <orgname>Red Hat Inc.</orgname>
</affiliation>
</author>
<author>
@@ -15,7 +15,7 @@
<affiliation>
<jobtitle>Web Beans (JSR-299 Reference Implementation) lead
</jobtitle>
- <orgname>Red Hat Middleware LLC</orgname>
+ <orgname>Red Hat Inc.</orgname>
</affiliation>
</author>
<author>
@@ -32,7 +32,7 @@
<surname>Guerrero</surname>
<contrib>Spanish Translation</contrib>
<affiliation>
- <orgname>Red Hat Middleware LLC</orgname>
+ <orgname>Red Hat Inc.</orgname>
</affiliation>
</othercredit>
<othercredit>
@@ -40,7 +40,7 @@
<surname>Ki,</surname>
<contrib>Korean Translation</contrib>
<affiliation>
- <orgname>Red Hat Middleware LLC</orgname>
+ <orgname>Red Hat Inc.</orgname>
</affiliation>
</othercredit>
<othercredit>
@@ -48,7 +48,7 @@
<surname>Chuang</surname>
<contrib>Traditional Chinese Translation</contrib>
<affiliation>
- <orgname>Red Hat Middleware LLC</orgname>
+ <orgname>Red Hat Inc.</orgname>
</affiliation>
</othercredit>
<othercredit>
16 years, 8 months
[webbeans-commits] Webbeans SVN: r3503 - in tck/trunk: impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client and 5 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-15 07:01:36 -0400 (Sat, 15 Aug 2009)
New Revision: 3503
Modified:
tck/trunk/doc/reference/en-US/Author_Group.xml
tck/trunk/doc/reference/en-US/Book_Info.xml
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/AbstractConversationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/BeanByTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/conversation/client/rain.jsf
Log:
fix a few tests
Modified: tck/trunk/doc/reference/en-US/Author_Group.xml
===================================================================
--- tck/trunk/doc/reference/en-US/Author_Group.xml 2009-08-15 09:40:56 UTC (rev 3502)
+++ tck/trunk/doc/reference/en-US/Author_Group.xml 2009-08-15 11:01:36 UTC (rev 3503)
@@ -7,7 +7,7 @@
<affiliation>
<jobtitle>JSR-299: Contexts and Dependency Injection (CDI) for Java EE
specification lead</jobtitle>
- <orgname>Red Hat Middleware LLC</orgname>
+ <orgname>Red Hat Inc.</orgname>
</affiliation>
</author>
<author>
@@ -15,7 +15,7 @@
<surname>Muir</surname>
<affiliation>
<jobtitle>CDI TCK lead</jobtitle>
- <orgname>Red Hat Middleware LLC</orgname>
+ <orgname>Red Hat Inc.</orgname>
</affiliation>
</author>
<author>
@@ -23,7 +23,7 @@
<surname>Allen</surname>
<affiliation>
<jobtitle>CDI TCK developer</jobtitle>
- <orgname>Red Hat Middleware LLC</orgname>
+ <orgname>Red Hat Inc.</orgname>
</affiliation>
</author>
<!--
Modified: tck/trunk/doc/reference/en-US/Book_Info.xml
===================================================================
--- tck/trunk/doc/reference/en-US/Book_Info.xml 2009-08-15 09:40:56 UTC (rev 3502)
+++ tck/trunk/doc/reference/en-US/Book_Info.xml 2009-08-15 11:01:36 UTC (rev 3503)
@@ -4,7 +4,7 @@
<copyright>
<year>2009</year>
<holder>
- Red Hat Middleware LLC, and individual contributors listed as authors.
+ Red Hat Inc., and individual contributors listed as authors.
</holder>
</copyright>
<releaseinfo><literallayout>Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,7 @@
<title>Technology Compatibility Kit Reference Guide for JSR-299: Context and
Dependency Injection for Java EE</title>
- <subtitle>Specification Lead: Red Hat Middleware LLC</subtitle>
+ <subtitle>Specification Lead: Red Hat Inc.</subtitle>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Author_Group.xml" />
<!--
vim: ts=3:sw=3:tw=80:set expandtab
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/AbstractConversationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/AbstractConversationTest.java 2009-08-15 09:40:56 UTC (rev 3502)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/AbstractConversationTest.java 2009-08-15 11:01:36 UTC (rev 3503)
@@ -116,26 +116,6 @@
}
}
- protected boolean hasRained(HttpClient client, String viewId) throws Exception
- {
- HttpMethod method = new GetMethod(getPath(viewId));
- try
- {
- client.executeMethod(method);
- assert method.getStatusCode() == 200;
- return method.getResponseHeader(Cloud.RAINED_HEADER_NAME).getValue().equals("true") ? true : false;
- }
- finally
- {
- method.releaseConnection();
- }
- }
-
- protected boolean hasRained(HttpClient client, String viewId, ConversationState c) throws Exception
- {
- return hasRained(client, viewId + "?" + CID_REQUEST_PARAMETER_NAME + "=" + c.getId());
- }
-
protected String getPath(String viewId)
{
return getContextPath() + viewId;
@@ -192,5 +172,15 @@
return page.getWebResponse().getResponseHeaderValue(AbstractConversationTest.CID_HEADER_NAME);
}
+ protected Boolean hasRained(HtmlPage page)
+ {
+ return Boolean.valueOf(page.getWebResponse().getResponseHeaderValue(Cloud.RAINED_HEADER_NAME));
+ }
+ protected Boolean isLongRunning(HtmlPage page)
+ {
+ return Boolean.valueOf(page.getWebResponse().getResponseHeaderValue(LONG_RUNNING_HEADER_NAME));
+ }
+
+
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2009-08-15 09:40:56 UTC (rev 3502)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2009-08-15 11:01:36 UTC (rev 3503)
@@ -12,6 +12,10 @@
import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor;
import org.testng.annotations.Test;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
+
/**
* @author Nicklas Karlsson
* @author Dan Allen
@@ -24,6 +28,7 @@
@Resource(destination="home.jspx", source="home.jsf"),
@Resource(destination="cloud.jspx", source="cloud.jsf"),
@Resource(destination="clouds.jspx", source="clouds.jsf"),
+ @Resource(destination="storm.jspx", source="storm.jsf"),
@Resource(destination="/WEB-INF/faces-config.xml", source="faces-config.xml"),
@Resource(destination="rain.jspx", source="rain.jsf")
})
@@ -31,23 +36,30 @@
public class ClientConversationContextTest extends AbstractConversationTest
{
- @Test(groups = { "contexts", "broken" })
+ @Test(groups = { "contexts"})
@SpecAssertions({
@SpecAssertion(section = "6.7.4", id = "hb"),
@SpecAssertion(section = "6.7.4", id = "o")
})
public void testConversationIdSetByContainerIsUnique() throws Exception
{
- // TODO Test assumes conversation.getId() is available when not in a lrc
- HttpClient client = new HttpClient();
- ConversationState c1 = request(client, "/home.jsf");
- ConversationState c2 = request(client, "/home.jsf");
- assert c1.isTransient();
- assert c2.isTransient();
- assert !c1.getId().equals(c2.getId());
+ WebClient webClient = new WebClient();
+ HtmlPage storm = webClient.getPage(getPath("/storm.jsf"));
+ HtmlSubmitInput beginConversationButton = getFirstMatchingElement(storm, HtmlSubmitInput.class, "beginConversationButton");
+ storm = beginConversationButton.click();
+
+ String c1 = getCid(storm);
+
+ storm = webClient.getPage(getPath("/storm.jsf"));
+ beginConversationButton = getFirstMatchingElement(storm, HtmlSubmitInput.class, "beginConversationButton");
+ storm = beginConversationButton.click();
+
+ String c2 = getCid(storm);
+
+ assert !c1.equals(c2);
}
- @Test(groups = { "contexts" })
+ @Test(groups = { "contexts", "rewrite" })
@SpecAssertion(section = "6.7.4", id = "j")
// TODO this test doesn't verify that the conversation context itself is destroyed
public void testTransientConversationInstancesDestroyedAtRequestEnd() throws Exception
@@ -59,42 +71,34 @@
assert isCloudDestroyed(client);
}
- @Test(groups = { "contexts", "broken"})
+ @Test(groups = { "contexts"})
@SpecAssertion(section = "6.7.4", id = "k")
public void testLongRunningConversationInstancesNotDestroyedAtRequestEnd() throws Exception
{
- // TODO Test assumes conversation.getId() is available when not in a lrc
HttpClient client = new HttpClient();
resetCloud(client);
ConversationState c = request(client, "/clouds.jsf");
assert !isCloudDestroyed(client);
- c = request(client, "/home.jsf", c);
- assert c.isLongRunning();
}
- @Test(groups = { "contexts", "broken" })
- @SpecAssertion(section = "6.7.4", id = "o")
- public void testConversationNotPropagated() throws Exception
- {
- // TODO Test assumes conversation.getId() is available when not in a lrc
- HttpClient client = new HttpClient();
- ConversationState c1 = request(client, "/clouds.jsf");
- ConversationState c2 = request(client, "/clouds.jsf");
- assert c1.isTransient();
- assert c2.isTransient();
- assert !c1.getId().equals(c2.getId());
- }
-
@Test(groups = { "contexts" , "broken"})
@SpecAssertion(section = "6.7.4", id = "p")
public void testConversationsDontCrossSessionBoundary1() throws Exception
{
- // TODO Test assumes conversation.getId() is available when not in a lrc
- HttpClient client = new HttpClient();
- ConversationState c1 = request(client, "/rain.jsf");
- assert hasRained(client, "/cloud.jsf", c1);
- invalidateSession(client);
- assert !hasRained(client, "/cloud.jsf", c1);
+ WebClient webClient = new WebClient();
+ HtmlPage rain = webClient.getPage(getPath("/rain.jsf"));
+ HtmlSubmitInput beginConversationButton = getFirstMatchingElement(rain, HtmlSubmitInput.class, "beginConversationButton");
+ rain = beginConversationButton.click();
+
+ HtmlSubmitInput rainButton = getFirstMatchingElement(rain, HtmlSubmitInput.class, "rain");
+
+ rain = rainButton.click();
+
+ assert hasRained(rain);
+
+ webClient.getPage(getConversationStatusPath("invalidateSession"));
+
+ assert !hasRained(rain);
}
@Test(groups = { "contexts" , "broken"})
@@ -105,8 +109,8 @@
HttpClient client1 = new HttpClient();
HttpClient client2 = new HttpClient();
ConversationState c1 = request(client1, "/rain.jsf");
- assert hasRained(client1, "/cloud.jsf", c1);
- assert !hasRained(client2, "/cloud.jsf", c1);
+ //assert hasRained(client1, "/cloud.jsf", c1.getId());
+ //assert !hasRained(client2, "/cloud.jsf", c1.getId());
}
@Test(groups = { "contexts" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java 2009-08-15 09:40:56 UTC (rev 3502)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java 2009-08-15 11:01:36 UTC (rev 3503)
@@ -42,10 +42,10 @@
return NAME;
}
- public String getRain()
+ public void rain()
{
rained = true;
- return "rain!";
+ System.out.println("rain!");
}
public boolean isRained()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java 2009-08-15 09:40:56 UTC (rev 3502)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java 2009-08-15 11:01:36 UTC (rev 3503)
@@ -1,6 +1,7 @@
package org.jboss.jsr299.tck.tests.context.conversation.client;
-import org.apache.commons.httpclient.HttpClient;
+import java.net.URL;
+
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -11,6 +12,11 @@
import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor;
import org.testng.annotations.Test;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.WebRequestSettings;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
+
/**
* @author Nicklas Karlsson
* @author Dan Allen
@@ -22,6 +28,7 @@
@Resources({
@Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"),
@Resource(destination="cloud.jspx", source="cloud.jsf"),
+ @Resource(destination="storm.jspx", source="storm.jsf"),
@Resource(destination="clouds.jspx", source="clouds.jsf"),
@Resource(destination="/WEB-INF/faces-config.xml", source="faces-config.xml")
})
@@ -33,12 +40,22 @@
@SpecAssertion(section = "6.7.4", id = "n")
public void testManualCidPropagation() throws Exception
{
- // TODO Test assumes conversation.getId() is available when not in a lrc
- HttpClient client = new HttpClient();
- ConversationState c1 = request(client, "/clouds.jsf");
- ConversationState c2 = request(client, "/cloud.jsf", c1);
- assert c2.isLongRunning();
- assert c1.getId().equals(c2.getId());
+ WebClient webClient = new WebClient();
+ HtmlPage storm = webClient.getPage(getPath("/storm.jsf"));
+ HtmlSubmitInput beginConversationButton = getFirstMatchingElement(storm, HtmlSubmitInput.class, "beginConversationButton");
+ storm = beginConversationButton.click();
+
+ String c1 = getCid(storm);
+
+ WebRequestSettings settings = new WebRequestSettings(new URL(getPath("/cloud.jsf")));
+ settings.addAdditionalHeader(CID_REQUEST_PARAMETER_NAME, c1);
+
+ HtmlPage cloud = webClient.getPage(settings);
+
+ String c2 = getCid(cloud);
+
+ assert isLongRunning(cloud);
+ assert c1.equals(c2);
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java 2009-08-15 09:40:56 UTC (rev 3502)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java 2009-08-15 11:01:36 UTC (rev 3503)
@@ -1,10 +1,11 @@
package org.jboss.jsr299.tck.tests.event.select;
import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.TypeLiteral;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
@@ -50,13 +51,13 @@
assert alarm.getNumViolentBreakIns() == 1;
}
- @Test(groups = {"events", "broken" }, expectedExceptions = IllegalArgumentException.class)
+ @Test(groups = {"events", "ri-broken" }, expectedExceptions = IllegalArgumentException.class)
@SpecAssertion(section = "10.3.1", id = "eab")
- public void testEventSelectThrowsExceptionIfEventTypeHasTypeVariable()
+ public <T> void testEventSelectThrowsExceptionIfEventTypeHasTypeVariable()
{
// TODO This test *doesn't* pass an event with a type variable in, it passes in a raw class PLM
SecuritySensor sensor = getInstanceByType(SecuritySensor.class);
- sensor.securityEvent.select(SecurityEvent_Illegal.class);
+ sensor.securityEvent.select(new TypeLiteral<SecurityEvent_Illegal<T>>() {});
}
@Test(groups = "events", expectedExceptions = IllegalArgumentException.class)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/BeanByTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/BeanByTypeTest.java 2009-08-15 09:40:56 UTC (rev 3502)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/BeanByTypeTest.java 2009-08-15 11:01:36 UTC (rev 3503)
@@ -17,7 +17,9 @@
package org.jboss.jsr299.tck.tests.extensions.bean.bytype;
+import java.lang.reflect.GenericDeclaration;
import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
import java.util.Set;
import javax.enterprise.inject.spi.Bean;
@@ -63,19 +65,31 @@
assert beans.iterator().next().getBindings().contains(new CurrentLiteral());
}
- @Test(groups = "broken", expectedExceptions = IllegalArgumentException.class)
+ @Test(expectedExceptions = IllegalArgumentException.class)
@SpecAssertions({
@SpecAssertion(section = "11.3.4", id = "da")
})
public void testTypeVariable()
{
- //TODO Not sure how to get a type variable passed here
- getCurrentManager().getBeans(getType(new SimpleBean()));
- }
+ TypeVariable<?> t = new TypeVariable<GenericDeclaration>()
+ {
- private <T> Type getType(T object)
- {
- return object.getClass();
+ public Type[] getBounds()
+ {
+ return new Type[0];
+ }
+
+ public GenericDeclaration getGenericDeclaration()
+ {
+ return null;
+ }
+
+ public String getName()
+ {
+ return "";
+ }
+ };
+ getCurrentManager().getBeans(t);
}
@Test(expectedExceptions = IllegalArgumentException.class)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-08-15 09:40:56 UTC (rev 3502)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-08-15 11:01:36 UTC (rev 3503)
@@ -4,10 +4,10 @@
import javax.enterprise.inject.AnnotationLiteral;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.Packaging;
@@ -26,7 +26,6 @@
private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() {};
@Test(groups="broken")
- // Needs @Alternatives
@SpecAssertions({
@SpecAssertion(section = "4.3", id = "ca")
})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2009-08-15 09:40:56 UTC (rev 3502)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2009-08-15 11:01:36 UTC (rev 3503)
@@ -3,9 +3,9 @@
import javax.enterprise.inject.spi.BeanManager;
import javax.naming.InitialContext;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.testng.annotations.Test;
@@ -15,7 +15,7 @@
@SpecVersion("20090625")
public class ManagerTest extends AbstractJSR299Test
{
- @Test(groups = { "manager", "ejb3", "integration", "rewrite" })
+ @Test(groups = { "manager", "ejb3", "integration", "rewrite", "jboss-as-broken" })
//TODO This test needs to use an EJB component that looks up the JNDI manager (java:comp)
@SpecAssertion(section = "11.3", id = "da")
public void testManagerLookupInJndi() throws Exception
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/conversation/client/rain.jsf
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/conversation/client/rain.jsf 2009-08-15 09:40:56 UTC (rev 3502)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/conversation/client/rain.jsf 2009-08-15 11:01:36 UTC (rev 3503)
@@ -14,8 +14,8 @@
</head>
<body>
<f:view>
- <h:outputText value="#{cloud.rain}" />
- <h:outputText value="#{cloudController.beginConversation}" />
+ <h:commandButton action="#{storm.beginConversation}" value="Thunder" id="beginConversationButton"/>
+ <h:commandButton action="#{cloud.rain}" value="Rain" id="rain"/>
</f:view>
</body>
</html>
16 years, 8 months
[webbeans-commits] Webbeans SVN: r3502 - in ri/trunk: spi/src/main/java/org/jboss/webbeans/transaction/spi and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-08-15 05:40:56 -0400 (Sat, 15 Aug 2009)
New Revision: 3502
Added:
ri/trunk/impl/src/main/java/org/jboss/webbeans/event/Status.java
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionSynchronizedRunnable.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverMethodImpl.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/transaction/spi/TransactionServices.java
Log:
Removed the Status enumeration from the TransactionServices SPI
Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/Status.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/Status.java (rev 0)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/Status.java 2009-08-15 09:40:56 UTC (rev 3502)
@@ -0,0 +1,32 @@
+/*
+ * 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.webbeans.event;
+
+/**
+ * An enumeration of the possible outcomes for a transaction. This is used
+ * to keep track of whether an observer wants to see all events regardless of
+ * the outcome of the transaction or only those transactions which succeed or
+ * fail.
+ *
+ * @author David Allen
+ *
+ */
+public enum Status
+{
+ ALL, SUCCESS, FAILURE
+}
Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/Status.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionSynchronizedRunnable.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionSynchronizedRunnable.java 2009-08-14 21:37:35 UTC (rev 3501)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionSynchronizedRunnable.java 2009-08-15 09:40:56 UTC (rev 3502)
@@ -20,8 +20,6 @@
import javax.transaction.Synchronization;
-import org.jboss.webbeans.transaction.spi.TransactionServices;
-
/**
* A JTA transaction sychronization which wraps a Runnable.
*
@@ -30,21 +28,21 @@
*/
public class TransactionSynchronizedRunnable implements Synchronization
{
- private final TransactionServices.Status desiredStatus;
+ private final Status desiredStatus;
private final Runnable task;
private final boolean before;
public TransactionSynchronizedRunnable(Runnable task, boolean before)
{
- this(task, TransactionServices.Status.ALL, before);
+ this(task, Status.ALL, before);
}
- public TransactionSynchronizedRunnable(Runnable task, TransactionServices.Status desiredStatus)
+ public TransactionSynchronizedRunnable(Runnable task, Status desiredStatus)
{
this(task, desiredStatus, false); // Status is only applicable after the transaction
}
- private TransactionSynchronizedRunnable(Runnable task, TransactionServices.Status desiredStatus, boolean before)
+ private TransactionSynchronizedRunnable(Runnable task, Status desiredStatus, boolean before)
{
this.task = task;
this.desiredStatus = desiredStatus;
@@ -58,7 +56,7 @@
*/
public void afterCompletion(int status)
{
- if ((desiredStatus == TransactionServices.Status.SUCCESS && status == STATUS_COMMITTED) || (desiredStatus == TransactionServices.Status.FAILURE && status != STATUS_COMMITTED) || (desiredStatus == TransactionServices.Status.ALL))
+ if ((desiredStatus == Status.SUCCESS && status == STATUS_COMMITTED) || (desiredStatus == Status.FAILURE && status != STATUS_COMMITTED) || (desiredStatus == Status.ALL))
{
task.run();
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverMethodImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverMethodImpl.java 2009-08-14 21:37:35 UTC (rev 3501)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverMethodImpl.java 2009-08-15 09:40:56 UTC (rev 3502)
@@ -74,21 +74,21 @@
DeferredEventNotification<T> deferredEvent = new DeferredEventNotification<T>(event, this);;
Synchronization synchronization = null;
- if (transactionPhase.equals(transactionPhase.BEFORE_COMPLETION))
+ if (transactionPhase.equals(TransactionPhase.BEFORE_COMPLETION))
{
synchronization = new TransactionSynchronizedRunnable(deferredEvent, true);
}
- else if (transactionPhase.equals(transactionPhase.AFTER_COMPLETION))
+ else if (transactionPhase.equals(TransactionPhase.AFTER_COMPLETION))
{
synchronization = new TransactionSynchronizedRunnable(deferredEvent, false);
}
- else if (transactionPhase.equals(transactionPhase.AFTER_SUCCESS))
+ else if (transactionPhase.equals(TransactionPhase.AFTER_SUCCESS))
{
- synchronization = new TransactionSynchronizedRunnable(deferredEvent, TransactionServices.Status.SUCCESS);
+ synchronization = new TransactionSynchronizedRunnable(deferredEvent, Status.SUCCESS);
}
- else if (transactionPhase.equals(transactionPhase.AFTER_FAILURE))
+ else if (transactionPhase.equals(TransactionPhase.AFTER_FAILURE))
{
- synchronization = new TransactionSynchronizedRunnable(deferredEvent, TransactionServices.Status.FAILURE);
+ synchronization = new TransactionSynchronizedRunnable(deferredEvent, Status.FAILURE);
}
manager.getServices().get(TransactionServices.class).registerSynchronization(synchronization);
}
Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/transaction/spi/TransactionServices.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/transaction/spi/TransactionServices.java 2009-08-14 21:37:35 UTC (rev 3501)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/transaction/spi/TransactionServices.java 2009-08-15 09:40:56 UTC (rev 3502)
@@ -24,15 +24,6 @@
public interface TransactionServices extends Service
{
/**
- * Possible status conditions for a transaction. This can be used by SPI
- * providers to keep track for which status an observer is used.
- */
- public static enum Status
- {
- ALL, SUCCESS, FAILURE
- }
-
- /**
* Registers a synchronization object with the currently executing
* transaction.
*
16 years, 8 months
[webbeans-commits] Webbeans SVN: r3501 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-14 17:37:35 -0400 (Fri, 14 Aug 2009)
New Revision: 3501
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/FamousCat.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/FamousCatLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Skinny.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyBinding.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyHairlessCat.java
Log:
Fix tests
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-08-14 21:31:24 UTC (rev 3500)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-08-14 21:37:35 UTC (rev 3501)
@@ -4,6 +4,7 @@
import java.util.Set;
import javax.enterprise.inject.Any;
+import javax.enterprise.inject.spi.Bean;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
@@ -38,7 +39,7 @@
@SpecAssertion(section = "4.1", id = "ala")
public void testBindingNotDeclaredInheritedIsNotInherited() throws Exception
{
- assert getBeans(SkinnyHairlessCatLocal.class, new HairlessBinding()).size() == 0;
+ assert getBeans(TameSkinnyHairlessCatLocal.class, new SkinnyBinding()).size() == 0;
}
@Test
@@ -53,6 +54,7 @@
@SpecAssertion(section = "4.1", id = "apa")
public void testBindingNotDeclaredInheritedIsNotIndirectlyInherited()
{
- assert getBeans(TameSkinnyHairlessCatLocal.class, new HairlessBinding()).size() == 0;
+ Set<Bean<FamousCatLocal>> beans = getBeans(FamousCatLocal.class, new SkinnyBinding());
+ assert beans.size() == 0;
}
}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/FamousCat.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/FamousCat.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/FamousCat.java 2009-08-14 21:37:35 UTC (rev 3501)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.definition.binding.enterprise;
+
+import javax.ejb.Stateless;
+
+@Stateless
+class FamousCat extends TameSkinnyHairlessCat implements FamousCatLocal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/FamousCat.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/FamousCatLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/FamousCatLocal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/FamousCatLocal.java 2009-08-14 21:37:35 UTC (rev 3501)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.definition.binding.enterprise;
+
+import javax.ejb.Local;
+
+@Local
+public interface FamousCatLocal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/FamousCatLocal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Skinny.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Skinny.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Skinny.java 2009-08-14 21:37:35 UTC (rev 3501)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.definition.binding.enterprise;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Skinny
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Skinny.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyBinding.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyBinding.java 2009-08-14 21:37:35 UTC (rev 3501)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.tests.definition.binding.enterprise;
+
+import javax.enterprise.inject.AnnotationLiteral;
+
+public class SkinnyBinding extends AnnotationLiteral<Skinny> implements Skinny
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyBinding.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyHairlessCat.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyHairlessCat.java 2009-08-14 21:31:24 UTC (rev 3500)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyHairlessCat.java 2009-08-14 21:37:35 UTC (rev 3501)
@@ -3,6 +3,7 @@
import javax.ejb.Stateless;
@Stateless
+@Skinny
class SkinnyHairlessCat extends HairlessCat implements SkinnyHairlessCatLocal
{
16 years, 8 months