[webbeans-commits] Webbeans SVN: r2447 - in examples/trunk/wicket: numberguess and 1 other directory.
by webbeans-commits@lists.jboss.org
Author: cpopetz
Date: 2009-04-16 15:48:25 -0400 (Thu, 16 Apr 2009)
New Revision: 2447
Added:
examples/trunk/wicket/conversations/build.xml
examples/trunk/wicket/numberguess/build.xml
Modified:
examples/trunk/wicket/conversations/pom.xml
examples/trunk/wicket/numberguess/pom.xml
Log:
WBX-25
Added: examples/trunk/wicket/conversations/build.xml
===================================================================
--- examples/trunk/wicket/conversations/build.xml (rev 0)
+++ examples/trunk/wicket/conversations/build.xml 2009-04-16 19:48:25 UTC (rev 2447)
@@ -0,0 +1,7 @@
+<project basedir="." name="Wicket Conversations Example Build" default="restart">
+
+ <property name="example.name" value="webbeans-conversations-wicket" />
+
+ <import file="../../build.xml" />
+
+</project>
Modified: examples/trunk/wicket/conversations/pom.xml
===================================================================
--- examples/trunk/wicket/conversations/pom.xml 2009-04-16 19:47:49 UTC (rev 2446)
+++ examples/trunk/wicket/conversations/pom.xml 2009-04-16 19:48:25 UTC (rev 2447)
@@ -74,6 +74,7 @@
</dependencies>
<build>
+ <finalName>webbeans-conversations-wicket</finalName>
<resources>
<resource>
<filtering>false</filtering>
Added: examples/trunk/wicket/numberguess/build.xml
===================================================================
--- examples/trunk/wicket/numberguess/build.xml (rev 0)
+++ examples/trunk/wicket/numberguess/build.xml 2009-04-16 19:48:25 UTC (rev 2447)
@@ -0,0 +1,7 @@
+<project basedir="." name="Wicket Numberguess Example Build" default="restart">
+
+ <property name="example.name" value="webbeans-numberguess-wicket" />
+
+ <import file="../../build.xml" />
+
+</project>
Modified: examples/trunk/wicket/numberguess/pom.xml
===================================================================
--- examples/trunk/wicket/numberguess/pom.xml 2009-04-16 19:47:49 UTC (rev 2446)
+++ examples/trunk/wicket/numberguess/pom.xml 2009-04-16 19:48:25 UTC (rev 2447)
@@ -75,6 +75,7 @@
</dependencies>
<build>
+ <finalName>webbeans-numberguess-wicket</finalName>
<resources>
<resource>
<filtering>false</filtering>
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2446 - examples/trunk/wicket/gae/war/WEB-INF.
by webbeans-commits@lists.jboss.org
Author: cpopetz
Date: 2009-04-16 15:47:49 -0400 (Thu, 16 Apr 2009)
New Revision: 2446
Modified:
examples/trunk/wicket/gae/war/WEB-INF/
Log:
hide classes
Property changes on: examples/trunk/wicket/gae/war/WEB-INF
___________________________________________________________________
Name: svn:ignore
+ classes
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2445 - ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/impl and 21 other directories.
by webbeans-commits@lists.jboss.org
Author: vitold
Date: 2009-04-16 15:12:11 -0400 (Thu, 16 Apr 2009)
New Revision: 2445
Added:
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/PaymentResource.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/JavaEePkgTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/Order.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/PaymentResource.java
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/javaeepkg/
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/javaeepkg/beans.xml
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/JavaEePkgTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/Order.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/PaymentResource.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/beans.xml
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/impl/BeanElementRegistratorImpl.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/Order.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/Order.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/Order.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/another/AnotherOrder.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/JavaEeNamespaceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/foo/Order.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/beans.xml
Log:
some changes with tests
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java 2009-04-16 19:10:01 UTC (rev 2444)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java 2009-04-16 19:12:11 UTC (rev 2445)
@@ -210,10 +210,19 @@
"> matches the name of both a method and a field of the bean class '" + beanClass.getName() + "'");
if(isField)
+ {
checkFieldChild(beanChildElement, beanClass);
+ return;
+ }
if(isMethod)
+ {
checkMethodChild(beanChildElement, beanClass);
+ return;
+ }
+
+ throw new DefinitionException("The name of the child element <" + beanChildElement.getName() +
+ "> not matches the name of a method or a field of the bean class '" + beanClass.getName() + "'");
}
private void checkFieldChild(Element beanChildElement, AnnotatedClass<?> beanClass)
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/impl/BeanElementRegistratorImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/impl/BeanElementRegistratorImpl.java 2009-04-16 19:10:01 UTC (rev 2444)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/impl/BeanElementRegistratorImpl.java 2009-04-16 19:12:11 UTC (rev 2445)
@@ -142,7 +142,7 @@
if(beanMethod != null)
{
- Iterator<?> beanChildIt = producesElement.elementIterator();
+ Iterator<?> beanChildIt = beanChild.elementIterator();
while(beanChildIt.hasNext())
{
Element element = (Element)beanChildIt.next();
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/Order.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/Order.java 2009-04-16 19:10:01 UTC (rev 2444)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/Order.java 2009-04-16 19:12:11 UTC (rev 2445)
@@ -1,34 +1,42 @@
package org.jboss.webbeans.test.unit.xml.beans;
-import javax.context.Dependent;
-import javax.inject.Current;
+import javax.context.RequestScoped;
import javax.inject.Initializer;
-import javax.inject.manager.Manager;
import org.jboss.webbeans.test.unit.xml.beans.annotationtype.TestBindingType;
import org.jboss.webbeans.test.unit.xml.beans.annotationtype.TestDeploymentType;
import org.jboss.webbeans.test.unit.xml.beans.annotationtype.TestInterceptorBindingType;
import org.jboss.webbeans.test.unit.xml.beans.annotationtype.TestStereotype;
+@RequestScoped
@TestBindingType
@TestInterceptorBindingType
@TestStereotype
@TestDeploymentType
public class Order
-{
- private boolean active;
+{
+ private int val;
+ private String[] strArr;
+
@Initializer
- public Order(@Current Manager manager)
+ public Order()
{
- if (manager.getContext(Dependent.class).isActive())
- {
- active = true;
- }
+ this.val = 0;
}
- public boolean isActive()
+ public Order(int val)
{
- return active;
+ this.val = val;
}
+
+ public int getVal()
+ {
+ return this.val;
+ }
+
+ public String[] getStrArr()
+ {
+ return this.strArr;
+ }
}
Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/PaymentResource.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/PaymentResource.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/PaymentResource.java 2009-04-16 19:12:11 UTC (rev 2445)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.test.unit.xml.beans;
+
+import javax.annotation.Resource;
+
+@Resource
+public class PaymentResource
+{
+
+}
Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/JavaEePkgTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/JavaEePkgTest.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/JavaEePkgTest.java 2009-04-16 19:12:11 UTC (rev 2445)
@@ -0,0 +1,20 @@
+package org.jboss.webbeans.test.unit.xml.javaeepkg;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Classes;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.webbeans.test.unit.xml.javaeepkg.foo.Order;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)Classes({Order.class})
+@BeansXml("beans.xml")
+public class JavaEePkgTest extends AbstractWebBeansTest
+{
+ @Test
+ public void testJavaEePkg()
+ {
+ assert getCurrentManager().resolveByType(Order.class).size() == 2;
+ }
+}
\ No newline at end of file
Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/Order.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/Order.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/Order.java 2009-04-16 19:12:11 UTC (rev 2445)
@@ -0,0 +1,53 @@
+package org.jboss.webbeans.test.unit.xml.javaeepkg.foo;
+
+import java.util.Date;
+
+import javax.annotation.Named;
+import javax.context.RequestScoped;
+import javax.ejb.ScheduleExpression;
+import javax.event.Event;
+import javax.inject.Initializer;
+import javax.inject.Produces;
+import javax.interceptor.InvocationContext;
+import javax.jms.Connection;
+import javax.persistence.EntityManager;
+import javax.sql.CommonDataSource;
+import javax.xml.ws.Binding;
+
+@Named("orderBean")
+@RequestScoped
+public class Order
+{
+ private Integer integer;
+
+ private Date date;
+
+ @Initializer
+ public Order()
+ {
+ this(0, new Date(), null, null, null, null, null, null, null);
+ }
+
+ public Order(Integer integer, Date date, CommonDataSource source, InvocationContext invocation, Event e, ScheduleExpression schedule,
+ EntityManager entityManager, Binding binding, Connection conn)
+ {
+ this.integer = integer;
+ this.date = date;
+ }
+
+ @Produces
+ public Order getOrder()
+ {
+ return new Order();
+ }
+
+ public Integer getInteger()
+ {
+ return integer;
+ }
+
+ public Date getDate()
+ {
+ return date;
+ }
+}
Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/PaymentResource.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/PaymentResource.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/PaymentResource.java 2009-04-16 19:12:11 UTC (rev 2445)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.test.unit.xml.javaeepkg.foo;
+
+import javax.annotation.Resource;
+
+@Resource
+public class PaymentResource
+{
+
+}
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-04-16 19:10:01 UTC (rev 2444)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-04-16 19:12:11 UTC (rev 2445)
@@ -59,6 +59,7 @@
XmlEnvironment parserEnv = new MockXmlEnvironment(getResources("user-defined-beans.xml"), new EjbDescriptorCache());
XmlParser parser = new XmlParser(parserEnv);
+ Set<Bean<Order>> beansSet1 = parserEnv.getManager().resolveByType(Order.class);
List<Class<? extends Annotation>> dTypes1 = parserEnv.getManager().getEnabledDeploymentTypes();
parser.parse();
Added: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/javaeepkg/beans.xml
===================================================================
--- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/javaeepkg/beans.xml (rev 0)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/javaeepkg/beans.xml 2009-04-16 19:12:11 UTC (rev 2445)
@@ -0,0 +1,43 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.webbeans.test.unit.xml.javaeepkg.foo">
+
+ <test:Order>
+ <RequestScoped />
+ <Integer />
+ <Date />
+ <CommonDataSource />
+ <InvocationContext />
+ <Event />
+ <ScheduleExpression />
+ <EntityManager />
+ <Binding />
+ <Connection />
+ <test:getOrder>
+ <Produces>
+ <test:Order />
+ </Produces>
+ </test:getOrder>
+ </test:Order>
+
+ <test:PaymentResource>
+ <Resource>
+ <name>java:app/service/PaymentService</name>
+ </Resource>
+ </test:PaymentResource>
+</Beans>
+
+
+<!--
+ javax.context.RequestScoped;
+ java.lang.Integer;
+ java.util.Date;
+ javax.sql.CommonDataSource;
+ javax.interceptor.InvocationContext;
+ javax.event.Event;
+ javax.ejb.ScheduleExpression;
+ javax.persistence.EntityManager;
+ javax.xml.ws.Binding;
+ javax.jms.Connection;
+ javax.inject.Produces;
+ javax.annotation.Resource;
+-->
\ No newline at end of file
Modified: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml
===================================================================
--- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml 2009-04-16 19:10:01 UTC (rev 2444)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml 2009-04-16 19:12:11 UTC (rev 2445)
@@ -30,10 +30,14 @@
<myapp:TestInterceptorBindingType />
<myapp:TestStereotype />
<myapp:TestDeploymentType />
- <myapp:isActive />
- <manager:Manager />
+ <Array>
+ <String />
+ </Array>
+ <myapp:getVal />
+ <myapp:val />
+ <Integer />
</myapp:Order>
- <myapp:PaymentService>
+ <myapp:PaymentResource>
<RequestScoped />
<myapp:TestBindingType />
<myapp:TestInterceptorBindingType />
@@ -42,7 +46,7 @@
<Resource>
<name>java:app/service/PaymentService</name>
</Resource>
- </myapp:PaymentService>
+ </myapp:PaymentResource>
<Decorators>
<myapp:TestDecorator />
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java 2009-04-16 19:10:01 UTC (rev 2444)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java 2009-04-16 19:12:11 UTC (rev 2445)
@@ -10,7 +10,7 @@
import org.jboss.jsr299.tck.tests.xml.annotationtypes.foo.TestNamed;
import org.jboss.jsr299.tck.tests.xml.annotationtypes.foo.TestScopeType;
import org.jboss.jsr299.tck.tests.xml.annotationtypes.foo.TestStereotype;
-import org.jboss.jsr299.tck.tests.xml.metadata.foo.Order;
+import org.jboss.jsr299.tck.tests.xml.annotationtypes.foo.Order;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Classes;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
@@ -18,6 +18,7 @@
@Artifact
@Classes({
+ Order.class,
TestBindingType.class,
TestInterceptorBindingType.class,
TestStereotype.class,
@@ -30,7 +31,7 @@
{
@Test
@SpecAssertions({
- @SpecAssertion(section="9", id="b"),
+ @SpecAssertion(section="9", id="d"),//without schema
@SpecAssertion(section="9.4", id="a"),
@SpecAssertion(section="9.4", id="b"),
@SpecAssertion(section="9.4", id="c"),
@@ -47,7 +48,6 @@
})
public void testAnnotationTypes()
{
-// assert getCurrentManager().resolveByType(Order.class).size() == 1;
- assert true;
+ assert getCurrentManager().resolveByType(Order.class).size() == 1;
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/Order.java 2009-04-16 19:10:01 UTC (rev 2444)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/Order.java 2009-04-16 19:12:11 UTC (rev 2445)
@@ -1,22 +1,28 @@
package org.jboss.jsr299.tck.tests.xml.annotationtypes.foo;
-import javax.context.RequestScoped;
+import javax.context.Dependent;
+import javax.inject.Current;
+import javax.inject.Initializer;
+import javax.inject.manager.Manager;
-@RequestScoped
@TestBindingType
@TestInterceptorBindingType
@TestStereotype
public class Order
-{
- private int val;
+{
+ private boolean active;
- public Order(int val)
+ @Initializer
+ public Order(@Current Manager manager)
{
- this.val = val;
+ if (manager.getContext(Dependent.class).isActive())
+ {
+ active = true;
+ }
}
- public int getVal()
+ public boolean isActive()
{
- return this.val;
+ return active;
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java 2009-04-16 19:10:01 UTC (rev 2444)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java 2009-04-16 19:12:11 UTC (rev 2445)
@@ -29,7 +29,7 @@
@SpecAssertions({
@SpecAssertion(section="9", id="b"),
@SpecAssertion(section="9", id="c"),
- @SpecAssertion(section="9", id="d"),
+ @SpecAssertion(section="9", id="d"),//with schema
@SpecAssertion(section="9.1", id="a"),
@SpecAssertion(section="9.1", id="b"),
@SpecAssertion(section="9.1", id="c"),
@@ -37,8 +37,7 @@
})
public void testXmlBasedMetadata()
{
-// assert getCurrentManager().resolveByType(Order.class).size() == 1;
-// assert getCurrentManager().resolveByType(AnotherOrder.class).size() == 1;
- assert true;
+ assert getCurrentManager().resolveByType(Order.class).size() == 1;
+ assert getCurrentManager().resolveByType(AnotherOrder.class).size() == 1;
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/Order.java 2009-04-16 19:10:01 UTC (rev 2444)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/Order.java 2009-04-16 19:12:11 UTC (rev 2445)
@@ -1,19 +1,32 @@
package org.jboss.jsr299.tck.tests.xml.metadata.foo;
-import javax.context.RequestScoped;
+import javax.context.Dependent;
+import javax.inject.Current;
+import javax.inject.Initializer;
+import javax.inject.manager.Manager;
-@RequestScoped
public class Order
{
- public String str;
+ private String str;
- public Order(String str)
+ private boolean active;
+
+ @Initializer
+ public Order(@Current Manager manager)
{
- this.str = str;
+ if (manager.getContext(Dependent.class).isActive())
+ {
+ active = true;
+ }
}
public String getStr()
{
return str;
}
+
+ public boolean isActive()
+ {
+ return active;
+ }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/another/AnotherOrder.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/another/AnotherOrder.java 2009-04-16 19:10:01 UTC (rev 2444)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/another/AnotherOrder.java 2009-04-16 19:12:11 UTC (rev 2445)
@@ -1,16 +1,33 @@
package org.jboss.jsr299.tck.tests.xml.metadata.foo.another;
+import javax.context.Dependent;
+import javax.inject.Current;
+import javax.inject.Initializer;
+import javax.inject.manager.Manager;
+
public class AnotherOrder
{
- public String str;
+ private String str;
- public AnotherOrder(String str)
+ private boolean active;
+
+ @Initializer
+ public AnotherOrder(@Current Manager manager)
{
- this.str = str;
+ if (manager.getContext(Dependent.class).isActive())
+ {
+ active = true;
+ }
}
public String getStr()
{
return str;
}
+
+ public boolean isActive()
+ {
+ return active;
+ }
}
+
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/JavaEeNamespaceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/JavaEeNamespaceTest.java 2009-04-16 19:10:01 UTC (rev 2444)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/JavaEeNamespaceTest.java 2009-04-16 19:12:11 UTC (rev 2445)
@@ -25,15 +25,13 @@
@SpecAssertion(section="9.1", id="e"),
@SpecAssertion(section="9.1", id="f"),
@SpecAssertion(section="9.2", id="f"),
- @SpecAssertion(section="9.2.1", id="a"),
- @SpecAssertion(section="9.2.1", id="b"),
- @SpecAssertion(section="9.2.1", id="c"),
- @SpecAssertion(section="9.2.1", id="d"),
- @SpecAssertion(section="9.2.1", id="e")
+ @SpecAssertion(section="9.2.1", id="b"),
+ @SpecAssertion(section="9.2.1", id="c"),
+ @SpecAssertion(section="9.2.1", id="d"),
+ @SpecAssertion(section="9.2.1", id="e")
})
public void testJavaEeNamespace()
{
-// assert getCurrentManager().resolveByType(Order.class).size() == 1;
- assert true;
+ assert getCurrentManager().resolveByType(Order.class).size() == 1;
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/foo/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/foo/Order.java 2009-04-16 19:10:01 UTC (rev 2444)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/foo/Order.java 2009-04-16 19:12:11 UTC (rev 2445)
@@ -1,15 +1,22 @@
package org.jboss.jsr299.tck.tests.xml.namespace.javaee.foo;
import javax.context.RequestScoped;
+import javax.inject.Initializer;
@RequestScoped
@AnotherDeploymentType
public class Order
{
- public int val;
+ private int val;
- public String[] strArr;
+ private String[] strArr;
+ @Initializer
+ public Order()
+ {
+ this.val = 0;
+ }
+
public Order(int val)
{
this.val = val;
@@ -19,4 +26,9 @@
{
return this.val;
}
+
+ public String[] getStrArr()
+ {
+ return this.strArr;
+ }
}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/JavaEePkgTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/JavaEePkgTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/JavaEePkgTest.java 2009-04-16 19:12:11 UTC (rev 2445)
@@ -0,0 +1,25 @@
+package org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg.foo.Order;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Classes;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)Classes({Order.class})
+@BeansXml("beans.xml")
+public class JavaEePkgTest extends AbstractJSR299Test
+{
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section="9.2.1", id="a")
+ })
+ public void testJavaEePkg()
+ {
+ assert getCurrentManager().resolveByType(Order.class).size() == 2;
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/Order.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/Order.java 2009-04-16 19:12:11 UTC (rev 2445)
@@ -0,0 +1,52 @@
+package org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg.foo;
+
+import java.util.Date;
+
+import javax.annotation.Named;
+import javax.context.RequestScoped;
+import javax.ejb.ScheduleExpression;
+import javax.event.Event;
+import javax.inject.Initializer;
+import javax.inject.Produces;
+import javax.interceptor.InvocationContext;
+import javax.persistence.EntityManager;
+import javax.sql.CommonDataSource;
+import javax.xml.ws.Binding;
+
+@Named("orderBean")
+@RequestScoped
+public class Order
+{
+ private Integer integer;
+
+ private Date date;
+
+ @Initializer
+ public Order()
+ {
+ this(0, new Date(), null, null, null, null, null, null);
+ }
+
+ public Order(Integer integer, Date date, CommonDataSource source, InvocationContext invocation, Event e, ScheduleExpression schedule,
+ EntityManager entityManager, Binding binding)
+ {
+ this.integer = integer;
+ this.date = date;
+ }
+
+ @Produces
+ public Order getOrder()
+ {
+ return new Order();
+ }
+
+ public Integer getInteger()
+ {
+ return integer;
+ }
+
+ public Date getDate()
+ {
+ return date;
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/PaymentResource.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/PaymentResource.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/PaymentResource.java 2009-04-16 19:12:11 UTC (rev 2445)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg.foo;
+
+import javax.annotation.Resource;
+
+@Resource
+public class PaymentResource
+{
+
+}
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml 2009-04-16 19:10:01 UTC (rev 2444)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml 2009-04-16 19:12:11 UTC (rev 2445)
@@ -1,5 +1,6 @@
<Beans xmlns="urn:java:ee"
- xmlns:dd="urn:java:ee urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.foo">
+ xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.foo"
+ xmlns:manager="urn:java:javax.inject.manager">
<dd:TestBindingType>
<BindingType />
</dd:TestBindingType>
@@ -15,10 +16,9 @@
<dd:TestNamed />
</dd:TestStereotype>
<dd:Order>
- <RequestScoped />
<dd:TestBindingType />
<dd:TestInterceptorBindingType />
<dd:TestStereotype />
- <Integer />
+ <manager:Manager />
</dd:Order>
</Beans>
\ No newline at end of file
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/beans.xml 2009-04-16 19:10:01 UTC (rev 2444)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/beans.xml 2009-04-16 19:12:11 UTC (rev 2445)
@@ -7,13 +7,15 @@
<dd:AnotherDeploymentType />
</Deploy>
<dd:Order>
- <RequestScoped />
- <dd:str>hello</dd:str>
+ <dd:str>
+ <value>hello</value>
+ </dd:str>
<dd:getStr />
</dd:Order>
<bb:AnotherOrder>
- <RequestScoped />
- <bb:str>hello one more time</bb:str>
+ <bb:str>
+ <value>hello one more time</value>
+ </bb:str>
<bb:getStr />
</bb:AnotherOrder>
</Beans>
\ No newline at end of file
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/beans.xml 2009-04-16 19:12:11 UTC (rev 2445)
@@ -0,0 +1,41 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg.foo">
+
+ <test:Order>
+ <RequestScoped />
+ <Integer />
+ <Date />
+ <CommonDataSource />
+ <InvocationContext />
+ <Event />
+ <ScheduleExpression />
+ <EntityManager />
+ <Binding />
+ <test:getOrder>
+ <Produces>
+ <test:Order />
+ </Produces>
+ </test:getOrder>
+ </test:Order>
+
+ <test:PaymentResource>
+ <Resource>
+ <name>java:app/service/PaymentService</name>
+ </Resource>
+ </test:PaymentResource>
+</Beans>
+
+
+<!--
+ javax.context.RequestScoped;
+ java.lang.Integer;
+ java.util.Date;
+ javax.sql.CommonDataSource;
+ javax.interceptor.InvocationContext;
+ javax.event.Event;
+ javax.ejb.ScheduleExpression;
+ javax.persistence.EntityManager;
+ javax.xml.ws.Binding;
+ javax.inject.Produces;
+ javax.annotation.Resource;
+-->
\ No newline at end of file
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2444 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/xml/resource and 6 other directories.
by webbeans-commits@lists.jboss.org
Author: dallen6
Date: 2009-04-16 15:10:01 -0400 (Thu, 16 Apr 2009)
New Revision: 2444
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjb.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjbInterface.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/SimpleBean.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/ic/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/ic/web.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/ejb-jar.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/web.xml
Log:
An EJB test for XML
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java 2009-04-16 19:10:01 UTC (rev 2444)
@@ -0,0 +1,59 @@
+/*
+ * 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.xml.resource.ejb;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+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;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+/**
+ * Simple lifecycle test with XML declaring injection of EJB.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+(a)Packaging(PackagingType.EAR)
+@IntegrationTest
+@Resources({
+ @Resource(source="web.xml", destination="WEB-INF/web.xml"),
+ @Resource(source="ejb-jar.xml", destination="META-INF/ejb-jar.xml")
+})
+@BeansXml("beans.xml")
+public class InjectionOfEjbTest extends AbstractJSR299Test
+{
+ @Test(groups = { "xml", "broken" })
+ @SpecAssertions( {
+ @SpecAssertion(section = "6.9", id = "i"),
+ @SpecAssertion(section = "3.6", id = "d")
+ })
+ public void testEjbInjectionByXml()
+ {
+ SimpleBean bean = getCurrentManager().getInstanceByType(SimpleBean.class);
+ assert bean.getRemoteEjb() != null;
+ bean.getRemoteEjb().hello();
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjb.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjb.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjb.java 2009-04-16 19:10:01 UTC (rev 2444)
@@ -0,0 +1,13 @@
+package org.jboss.jsr299.tck.tests.xml.resource.ejb;
+
+import javax.ejb.Stateless;
+
+@Stateless(name="MyRemoteEjb")
+public class RemoteEjb implements RemoteEjbInterface
+{
+
+ public void hello()
+ {
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjb.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjbInterface.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjbInterface.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjbInterface.java 2009-04-16 19:10:01 UTC (rev 2444)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.xml.resource.ejb;
+
+import javax.ejb.Remote;
+
+@Remote
+public interface RemoteEjbInterface
+{
+ public void hello();
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjbInterface.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/SimpleBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/SimpleBean.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/SimpleBean.java 2009-04-16 19:10:01 UTC (rev 2444)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.tests.xml.resource.ejb;
+
+class SimpleBean
+{
+ private RemoteEjbInterface remoteEjb = null;
+
+ public RemoteEjbInterface getRemoteEjb()
+ {
+ return remoteEjb;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/SimpleBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/ic/web.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/ic/web.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/ic/web.xml 2009-04-16 19:10:01 UTC (rev 2444)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <description>Test resources to inject into simple beans.</description>
+ <display-name>SimpleBeanEEInjections</display-name>
+ <session-config>
+ <session-timeout>10</session-timeout>
+ </session-config>
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ </login-config>
+</web-app>
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/ic/web.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/beans.xml 2009-04-16 19:10:01 UTC (rev 2444)
@@ -0,0 +1,12 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.resource.ejb">
+ <Deploy>
+ <Standard />
+ <Production />
+ </Deploy>
+ <test:SimpleBean>
+ <EJB>
+ <name>xml-resource-ejb/MyRemoteEjb/remote</name>
+ </EJB>
+ </test:SimpleBean>
+</Beans>
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/ejb-jar.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/ejb-jar.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/ejb-jar.xml 2009-04-16 19:10:01 UTC (rev 2444)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
+ version="3.0">
+
+ <enterprise-beans>
+ <!-- EJB reference required when beans.xml references another EJB component using <EJB> -->
+ <session>
+ <ejb-name>MyRemoteEjb</ejb-name>
+ <ejb-ref>
+ <ejb-ref-name>xml-resource-ejb/MyRemoteEjb/remote</ejb-ref-name>
+ <ejb-ref-type>Session</ejb-ref-type>
+ <remote>org.jboss.seam.example.booking.Authenticator</remote>
+ </ejb-ref>
+ </session>
+ </enterprise-beans>
+</ejb-jar>
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/ejb-jar.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/web.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/web.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/web.xml 2009-04-16 19:10:01 UTC (rev 2444)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <description>Test servlets used to test session contexts.</description>
+ <display-name>Session Context Tests</display-name>
+
+ <ejb-ref>
+ <ejb-ref-name>xml-resource-ejb/MyRemoteEjb/remote</ejb-ref-name>
+ <ejb-ref-type>Session</ejb-ref-type>
+ <remote>org.jboss.jsr299.tck.tests.xml.resource.ejb.RemoteEjbInterface</remote>
+ </ejb-ref>
+
+ <session-config>
+ <session-timeout>10</session-timeout>
+ </session-config>
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ </login-config>
+</web-app>
\ No newline at end of file
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/web.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2443 - in examples/trunk/wicket: conversations/src/main/resources and 1 other directories.
by webbeans-commits@lists.jboss.org
Author: cpopetz
Date: 2009-04-16 15:07:53 -0400 (Thu, 16 Apr 2009)
New Revision: 2443
Modified:
examples/trunk/wicket/conversations/pom.xml
examples/trunk/wicket/conversations/src/main/resources/beans.xml
examples/trunk/wicket/numberguess/pom.xml
Log:
fix building a .war for these two, and make dependencies work for compiling from command line.
Modified: examples/trunk/wicket/conversations/pom.xml
===================================================================
--- examples/trunk/wicket/conversations/pom.xml 2009-04-16 18:24:09 UTC (rev 2442)
+++ examples/trunk/wicket/conversations/pom.xml 2009-04-16 19:07:53 UTC (rev 2443)
@@ -36,14 +36,12 @@
<dependency>
<groupId>org.jboss.webbeans.tomcat</groupId>
<artifactId>webbeans-tomcat</artifactId>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-wicket</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <scope>runtime</scope>
</dependency>
<dependency>
@@ -114,6 +112,22 @@
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.5.1</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources>
+ <resource>
+ <directory>src/main/webapp/WEB-INF</directory>
+ <targetPath>WEB-INF</targetPath>
+ <includes>
+ <include>**/beans.xml</include>
+ <include>**/web.xml</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: examples/trunk/wicket/conversations/src/main/resources/beans.xml
===================================================================
--- examples/trunk/wicket/conversations/src/main/resources/beans.xml 2009-04-16 18:24:09 UTC (rev 2442)
+++ examples/trunk/wicket/conversations/src/main/resources/beans.xml 2009-04-16 19:07:53 UTC (rev 2443)
@@ -1,7 +0,0 @@
-<Beans xmlns="urn:java:ee" xmlns:conversations="urn:java:org.jboss.webbeans.examples.conversations">
- <Deploy>
- <Standard />
- <Production />
- <conversations:Example />
- </Deploy>
-</Beans>
Modified: examples/trunk/wicket/numberguess/pom.xml
===================================================================
--- examples/trunk/wicket/numberguess/pom.xml 2009-04-16 18:24:09 UTC (rev 2442)
+++ examples/trunk/wicket/numberguess/pom.xml 2009-04-16 19:07:53 UTC (rev 2443)
@@ -43,7 +43,6 @@
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-wicket</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <scope>runtime</scope>
</dependency>
<dependency>
@@ -114,6 +113,22 @@
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.5.1</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources>
+ <resource>
+ <directory>src/main/webapp/WEB-INF</directory>
+ <targetPath>WEB-INF</targetPath>
+ <includes>
+ <include>**/beans.xml</include>
+ <include>**/web.xml</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
</plugins>
</build>
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2442 - in ri/trunk/logging/src: test/java/org/jboss/webbeans/test/log and 1 other directory.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-16 14:24:09 -0400 (Thu, 16 Apr 2009)
New Revision: 2442
Modified:
ri/trunk/logging/src/main/java/org/jboss/webbeans/log/LogImpl.java
ri/trunk/logging/src/test/java/org/jboss/webbeans/test/log/LoggingTest.java
Log:
WBX-22
Modified: ri/trunk/logging/src/main/java/org/jboss/webbeans/log/LogImpl.java
===================================================================
--- ri/trunk/logging/src/main/java/org/jboss/webbeans/log/LogImpl.java 2009-04-16 17:35:33 UTC (rev 2441)
+++ ri/trunk/logging/src/main/java/org/jboss/webbeans/log/LogImpl.java 2009-04-16 18:24:09 UTC (rev 2442)
@@ -21,6 +21,7 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.text.MessageFormat;
+import java.util.Arrays;
/**
*
@@ -173,6 +174,13 @@
Object interpolatedMessage = message;
if (params.length > 0)
{
+ for (int i = 0; i < params.length; i++)
+ {
+ if (params[i].getClass().isArray())
+ {
+ params[i] = Arrays.asList((Object[]) params[i]);
+ }
+ }
interpolatedMessage = MessageFormat.format(message.toString(), params);
}
return interpolatedMessage;
Modified: ri/trunk/logging/src/test/java/org/jboss/webbeans/test/log/LoggingTest.java
===================================================================
--- ri/trunk/logging/src/test/java/org/jboss/webbeans/test/log/LoggingTest.java 2009-04-16 17:35:33 UTC (rev 2441)
+++ ri/trunk/logging/src/test/java/org/jboss/webbeans/test/log/LoggingTest.java 2009-04-16 18:24:09 UTC (rev 2442)
@@ -56,4 +56,19 @@
assert TestAppender.getLastEvent() != null : "There was no last event in Log4j";
assert TestAppender.getLastEvent().getRenderedMessage().equals("Message with 3 parameters starting with param1 and including param2");
}
+
+ @Test
+ public void testArrayConversion()
+ {
+ Log log = Logging.getLog(LoggingTest.class);
+ assert log != null : "No Log object returned";
+
+ String[] arr = new String[2];
+ arr[0] = "foo";
+ arr[1] = "bar";
+
+ log.info("Message with {0} array {1}", arr, "baz");
+ assert TestAppender.getLastEvent() != null : "There was no last event in Log4j";
+ assert TestAppender.getLastEvent().getRenderedMessage().equals("Message with [foo, bar] array baz");
+ }
}
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2441 - in examples/trunk/wicket: gae and 12 other directories.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-16 13:35:33 -0400 (Thu, 16 Apr 2009)
New Revision: 2441
Added:
examples/trunk/wicket/gae/
examples/trunk/wicket/gae/.classpath
examples/trunk/wicket/gae/.project
examples/trunk/wicket/gae/.settings/
examples/trunk/wicket/gae/.settings/com.google.appengine.eclipse.core.prefs
examples/trunk/wicket/gae/.settings/com.google.gdt.eclipse.core.prefs
examples/trunk/wicket/gae/.settings/com.google.gwt.eclipse.core.prefs
examples/trunk/wicket/gae/.settings/org.eclipse.jdt.core.prefs
examples/trunk/wicket/gae/readme.txt
examples/trunk/wicket/gae/src/
examples/trunk/wicket/gae/src/main/
examples/trunk/wicket/gae/src/main/java/
examples/trunk/wicket/gae/src/main/java/org/
examples/trunk/wicket/gae/src/main/java/org/jboss/
examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/
examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/
examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/
examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/Game.java
examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/Generator.java
examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.html
examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.java
examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/MaxNumber.java
examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/Random.java
examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/SampleApplication.java
examples/trunk/wicket/gae/src/main/resources/
examples/trunk/wicket/gae/src/test/
examples/trunk/wicket/gae/war/
examples/trunk/wicket/gae/war/WEB-INF/
examples/trunk/wicket/gae/war/WEB-INF/appengine-web.xml
examples/trunk/wicket/gae/war/WEB-INF/beans.xml
examples/trunk/wicket/gae/war/WEB-INF/lib/
examples/trunk/wicket/gae/war/WEB-INF/lib/appengine-api-1.0-sdk-1.2.0.jar
examples/trunk/wicket/gae/war/WEB-INF/lib/datanucleus-appengine-1.0.0.final.jar
examples/trunk/wicket/gae/war/WEB-INF/lib/datanucleus-core-1.1.0.jar
examples/trunk/wicket/gae/war/WEB-INF/lib/datanucleus-jpa-1.1.0.jar
examples/trunk/wicket/gae/war/WEB-INF/lib/geronimo-jpa_3.0_spec-1.1.1.jar
examples/trunk/wicket/gae/war/WEB-INF/lib/geronimo-jta_1.1_spec-1.1.1.jar
examples/trunk/wicket/gae/war/WEB-INF/lib/jdo2-api-2.3-SNAPSHOT.jar
examples/trunk/wicket/gae/war/WEB-INF/lib/jsr250-api-1.0.jar
examples/trunk/wicket/gae/war/WEB-INF/lib/slf4j-api-1.4.2.jar
examples/trunk/wicket/gae/war/WEB-INF/lib/slf4j-jdk14-1.4.2.jar
examples/trunk/wicket/gae/war/WEB-INF/lib/webbeans-tomcat-1.0.0-SNAPSHOT.jar
examples/trunk/wicket/gae/war/WEB-INF/lib/webbeans-wicket-1.0.0-SNAPSHOT.jar
examples/trunk/wicket/gae/war/WEB-INF/lib/wicket-1.3-SNAPSHOT.jar
examples/trunk/wicket/gae/war/WEB-INF/logging.properties
examples/trunk/wicket/gae/war/WEB-INF/web.xml
Log:
add gae example
Added: examples/trunk/wicket/gae/.classpath
===================================================================
--- examples/trunk/wicket/gae/.classpath (rev 0)
+++ examples/trunk/wicket/gae/.classpath 2009-04-16 17:35:33 UTC (rev 2441)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER"/>
+ <classpathentry kind="lib" path="war/WEB-INF/lib/webbeans-tomcat-1.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="war/WEB-INF/lib/wicket-1.3-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="war/WEB-INF/lib/webbeans-wicket-1.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="war/WEB-INF/lib/slf4j-api-1.4.2.jar"/>
+ <classpathentry kind="output" path="war/WEB-INF/classes"/>
+</classpath>
Added: examples/trunk/wicket/gae/.project
===================================================================
--- examples/trunk/wicket/gae/.project (rev 0)
+++ examples/trunk/wicket/gae/.project 2009-04-16 17:35:33 UTC (rev 2441)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>webbeans-wicket-numberguess-gae</name>
+ <comment>Examples for the reference implementation of JSR 299: Web Beans</comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.google.gdt.eclipse.core.webAppProjectValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.google.appengine.eclipse.core.enhancerbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.google.appengine.eclipse.core.projectValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>com.google.gdt.eclipse.core.webAppNature</nature>
+ <nature>com.google.appengine.eclipse.core.gaeNature</nature>
+ </natures>
+</projectDescription>
Added: examples/trunk/wicket/gae/.settings/com.google.appengine.eclipse.core.prefs
===================================================================
--- examples/trunk/wicket/gae/.settings/com.google.appengine.eclipse.core.prefs (rev 0)
+++ examples/trunk/wicket/gae/.settings/com.google.appengine.eclipse.core.prefs 2009-04-16 17:35:33 UTC (rev 2441)
@@ -0,0 +1,5 @@
+#Thu Apr 16 18:08:00 BST 2009
+eclipse.preferences.version=1
+filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.2.0.jar|datanucleus-appengine-1.0.0.final.jar|datanucleus-core-1.1.0.jar|datanucleus-jpa-1.1.0.jar|geronimo-jpa_3.0_spec-1.1.1.jar|geronimo-jta_1.1_spec-1.1.1.jar|jdo2-api-2.3-SNAPSHOT.jar
+ormEnhancementInclusions=
+validationExclusions=
Added: examples/trunk/wicket/gae/.settings/com.google.gdt.eclipse.core.prefs
===================================================================
--- examples/trunk/wicket/gae/.settings/com.google.gdt.eclipse.core.prefs (rev 0)
+++ examples/trunk/wicket/gae/.settings/com.google.gdt.eclipse.core.prefs 2009-04-16 17:35:33 UTC (rev 2441)
@@ -0,0 +1,3 @@
+#Thu Apr 16 18:07:55 BST 2009
+eclipse.preferences.version=1
+jarsExcludedFromWebInfLib=
Added: examples/trunk/wicket/gae/.settings/com.google.gwt.eclipse.core.prefs
===================================================================
--- examples/trunk/wicket/gae/.settings/com.google.gwt.eclipse.core.prefs (rev 0)
+++ examples/trunk/wicket/gae/.settings/com.google.gwt.eclipse.core.prefs 2009-04-16 17:35:33 UTC (rev 2441)
@@ -0,0 +1,3 @@
+#Thu Apr 16 18:08:00 BST 2009
+eclipse.preferences.version=1
+filesCopiedToWebInfLib=
Added: examples/trunk/wicket/gae/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- examples/trunk/wicket/gae/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ examples/trunk/wicket/gae/.settings/org.eclipse.jdt.core.prefs 2009-04-16 17:35:33 UTC (rev 2441)
@@ -0,0 +1,5 @@
+#Thu Apr 16 17:56:57 BST 2009
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
Added: examples/trunk/wicket/gae/readme.txt
===================================================================
--- examples/trunk/wicket/gae/readme.txt (rev 0)
+++ examples/trunk/wicket/gae/readme.txt 2009-04-16 17:35:33 UTC (rev 2441)
@@ -0,0 +1,5 @@
+This example is similar to its sibling "numberguess" example, but implemented
+with wicket and the wicket-webbeans integration. It can be deployed to google
+app engine using the eclipse plugin
+
+
Added: examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/Game.java
===================================================================
--- examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/Game.java (rev 0)
+++ examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/Game.java 2009-04-16 17:35:33 UTC (rev 2441)
@@ -0,0 +1,86 @@
+package org.jboss.webbeans.examples.wicket;
+
+
+import java.io.Serializable;
+
+import javax.annotation.Named;
+import javax.annotation.PostConstruct;
+import javax.context.SessionScoped;
+import javax.inject.AnnotationLiteral;
+import javax.inject.Current;
+import javax.inject.manager.Manager;
+
+@Named
+@SessionScoped
+public class Game implements Serializable
+{
+ private int number;
+
+ private int guess;
+ private int smallest;
+
+ @MaxNumber
+ private int maxNumber;
+
+ private int biggest;
+ private int remainingGuesses;
+
+ @Current Manager manager;
+
+ public int getNumber()
+ {
+ return number;
+ }
+
+ public int getGuess()
+ {
+ return guess;
+ }
+
+ public void setGuess(int guess)
+ {
+ this.guess = guess;
+ }
+
+ public int getSmallest()
+ {
+ return smallest;
+ }
+
+ public int getBiggest()
+ {
+ return biggest;
+ }
+
+ public int getRemainingGuesses()
+ {
+ return remainingGuesses;
+ }
+
+ public boolean check()
+ {
+ if (guess>number)
+ {
+ biggest = guess - 1;
+ }
+ if (guess<number)
+ {
+ smallest = guess + 1;
+ }
+ remainingGuesses--;
+ return (guess == number);
+ }
+
+
+ @PostConstruct
+ public void reset()
+ {
+ this.smallest = 0;
+ this.guess = 0;
+ this.remainingGuesses = 10;
+ this.biggest = maxNumber;
+ this.number = manager.getInstanceByType(Integer.class, new AnnotationLiteral<Random>(){});
+ }
+
+
+}
Property changes on: examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/Game.java
___________________________________________________________________
Name: svn:executable
+ *
Added: examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/Generator.java
===================================================================
--- examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/Generator.java (rev 0)
+++ examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/Generator.java 2009-04-16 17:35:33 UTC (rev 2441)
@@ -0,0 +1,34 @@
+package org.jboss.webbeans.examples.wicket;
+
+
+import java.io.Serializable;
+
+import javax.context.ApplicationScoped;
+import javax.inject.Produces;
+
+
+@ApplicationScoped
+public class Generator implements Serializable
+{
+
+ private static final long serialVersionUID = -7213673465118041882L;
+
+ private java.util.Random random = new java.util.Random( System.currentTimeMillis() );
+
+ private int maxNumber = 100;
+
+ java.util.Random getRandom()
+ {
+ return random;
+ }
+
+ @Produces @Random int next() {
+ return getRandom().nextInt(maxNumber);
+ }
+
+ @Produces @MaxNumber int getMaxNumber()
+ {
+ return maxNumber;
+ }
+
+}
Property changes on: examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/Generator.java
___________________________________________________________________
Name: svn:executable
+ *
Added: examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.html
===================================================================
--- examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.html (rev 0)
+++ examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.html 2009-04-16 17:35:33 UTC (rev 2441)
@@ -0,0 +1,29 @@
+<html>
+ <head>
+ <title>Wicket WebBeans example</title>
+ </head>
+ <body>
+ <h1>Guess a number...</h1>
+ <form wicket:id="NumberGuessMain">
+ <div style="color: red">
+ <span wicket:id="messages"/>
+ </div>
+
+ <div wicket:id="prompt">
+ I'm thinking of a number between 0 and 100. You have 10 guesses.
+ </div>
+
+ <div>
+ <span wicket:id="guessLabel">Your guess:</span>
+ <input wicket:id="inputGuess" type="text" size="3"/>
+ <input wicket:id="GuessButton" type="submit" value="Guess"/>
+ <input wicket:id="RestartButton" type="submit" value="Reset"/>
+ <h:commandButton id="GuessButton" value="Guess" action="#{game.check}" disabled="#{game.number eq game.guess}"/>
+ </div>
+ <div>
+ <h:commandButton id="RestartButton" value="Reset" action="#{game.reset}" immediate="true" />
+ </div>
+ </form>
+ </body>
+</html>
+
Property changes on: examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.html
___________________________________________________________________
Name: svn:executable
+ *
Added: examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.java
===================================================================
--- examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.java (rev 0)
+++ examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.java 2009-04-16 17:35:33 UTC (rev 2441)
@@ -0,0 +1,84 @@
+package org.jboss.webbeans.examples.wicket;
+
+import javax.inject.Current;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.behavior.AbstractBehavior;
+import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Button;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.panel.FeedbackPanel;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.target.component.listener.BehaviorRequestTarget;
+
+public class HomePage extends WebPage {
+
+ private static final long serialVersionUID = 1L;
+
+ @Current Game game;
+
+ public HomePage() {
+
+
+ Form form = new Form("NumberGuessMain");
+ add(form);
+ form.add(new FeedbackPanel("messages").setOutputMarkupId(true));
+
+ final Component prompt = new Label("prompt", new Model() {
+ @Override
+ public Object getObject() {
+ return "I'm thinking of a number between " + game.getSmallest() + " and " + game.getBiggest() +
+ ". You have " + game.getRemainingGuesses() + " guesses.";
+ }
+ });
+ form.add(prompt);
+
+ final Component guessLabel = new Label("guessLabel","Your Guess:");
+ form.add(guessLabel);
+ final Component inputGuess = new TextField("inputGuess",new Model() {
+ public Object getObject() {
+ return game.getGuess();
+ }
+ public void setObject(Object object) {
+ game.setGuess(Integer.parseInt((String)object));
+ }
+ });
+ form.add(inputGuess);
+
+ final Component guessButton = new AjaxButton("GuessButton") {
+ protected void onSubmit(AjaxRequestTarget target, Form form) {
+ if (game.check()) {
+ info("Correct!");
+ setVisible(false);
+ prompt.setVisible(false);
+ guessLabel.setVisible(false);
+ inputGuess.setVisible(false);
+ }
+ else if (game.getNumber() > game.getGuess())
+ info("Higher!");
+ else if (game.getNumber() < game.getGuess())
+ info("Lower");
+ target.addComponent(form);
+ }
+ };
+ form.add(guessButton);
+
+ form.add(new AjaxButton("RestartButton") {
+ protected void onSubmit(AjaxRequestTarget target, Form form) {
+ game.reset();
+ guessButton.setVisible(true);
+ prompt.setVisible(true);
+ guessLabel.setVisible(true);
+ inputGuess.setVisible(true);
+ target.addComponent(form);
+ }
+ });
+
+ }
+}
Property changes on: examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.java
___________________________________________________________________
Name: svn:executable
+ *
Added: examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/MaxNumber.java
===================================================================
--- examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/MaxNumber.java (rev 0)
+++ examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/MaxNumber.java 2009-04-16 17:35:33 UTC (rev 2441)
@@ -0,0 +1,23 @@
+package org.jboss.webbeans.examples.wicket;
+
+
+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.inject.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+public @interface MaxNumber
+{
+
+}
Property changes on: examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/MaxNumber.java
___________________________________________________________________
Name: svn:executable
+ *
Added: examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/Random.java
===================================================================
--- examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/Random.java (rev 0)
+++ examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/Random.java 2009-04-16 17:35:33 UTC (rev 2441)
@@ -0,0 +1,23 @@
+package org.jboss.webbeans.examples.wicket;
+
+
+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.inject.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+public @interface Random
+{
+
+}
Property changes on: examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/Random.java
___________________________________________________________________
Name: svn:executable
+ *
Added: examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/SampleApplication.java
===================================================================
--- examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/SampleApplication.java (rev 0)
+++ examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/SampleApplication.java 2009-04-16 17:35:33 UTC (rev 2441)
@@ -0,0 +1,32 @@
+package org.jboss.webbeans.examples.wicket;
+
+import org.apache.wicket.protocol.http.HttpSessionStore;
+import org.apache.wicket.session.ISessionStore;
+import org.jboss.webbeans.wicket.WebBeansApplication;
+
+public class SampleApplication extends WebBeansApplication
+{
+
+ @Override
+ protected void init()
+ {
+ // GAE doesn't allow resource modification watching
+ getResourceSettings().setResourcePollFrequency(null);
+
+ //
+ }
+
+ @Override
+ protected ISessionStore newSessionStore()
+ {
+ // GAE doesn't allow disk access (default for Wicket)
+ return new HttpSessionStore(this);
+ }
+
+ @Override
+ public Class<?> getHomePage()
+ {
+ return HomePage.class;
+ }
+
+}
Property changes on: examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/SampleApplication.java
___________________________________________________________________
Name: svn:executable
+ *
Added: examples/trunk/wicket/gae/war/WEB-INF/appengine-web.xml
===================================================================
--- examples/trunk/wicket/gae/war/WEB-INF/appengine-web.xml (rev 0)
+++ examples/trunk/wicket/gae/war/WEB-INF/appengine-web.xml 2009-04-16 17:35:33 UTC (rev 2441)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+ <application>webbeans-wicket-numberguess</application>
+ <version>1</version>
+
+ <!-- Configure java.util.logging -->
+ <system-properties>
+ <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
+ </system-properties>
+
+ <sessions-enabled>true</sessions-enabled>
+
+</appengine-web-app>
\ No newline at end of file
Added: examples/trunk/wicket/gae/war/WEB-INF/beans.xml
===================================================================
Added: examples/trunk/wicket/gae/war/WEB-INF/lib/appengine-api-1.0-sdk-1.2.0.jar
===================================================================
(Binary files differ)
Property changes on: examples/trunk/wicket/gae/war/WEB-INF/lib/appengine-api-1.0-sdk-1.2.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: examples/trunk/wicket/gae/war/WEB-INF/lib/datanucleus-appengine-1.0.0.final.jar
===================================================================
(Binary files differ)
Property changes on: examples/trunk/wicket/gae/war/WEB-INF/lib/datanucleus-appengine-1.0.0.final.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: examples/trunk/wicket/gae/war/WEB-INF/lib/datanucleus-core-1.1.0.jar
===================================================================
(Binary files differ)
Property changes on: examples/trunk/wicket/gae/war/WEB-INF/lib/datanucleus-core-1.1.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: examples/trunk/wicket/gae/war/WEB-INF/lib/datanucleus-jpa-1.1.0.jar
===================================================================
(Binary files differ)
Property changes on: examples/trunk/wicket/gae/war/WEB-INF/lib/datanucleus-jpa-1.1.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: examples/trunk/wicket/gae/war/WEB-INF/lib/geronimo-jpa_3.0_spec-1.1.1.jar
===================================================================
(Binary files differ)
Property changes on: examples/trunk/wicket/gae/war/WEB-INF/lib/geronimo-jpa_3.0_spec-1.1.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: examples/trunk/wicket/gae/war/WEB-INF/lib/geronimo-jta_1.1_spec-1.1.1.jar
===================================================================
(Binary files differ)
Property changes on: examples/trunk/wicket/gae/war/WEB-INF/lib/geronimo-jta_1.1_spec-1.1.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: examples/trunk/wicket/gae/war/WEB-INF/lib/jdo2-api-2.3-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: examples/trunk/wicket/gae/war/WEB-INF/lib/jdo2-api-2.3-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: examples/trunk/wicket/gae/war/WEB-INF/lib/jsr250-api-1.0.jar
===================================================================
(Binary files differ)
Property changes on: examples/trunk/wicket/gae/war/WEB-INF/lib/jsr250-api-1.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: examples/trunk/wicket/gae/war/WEB-INF/lib/slf4j-api-1.4.2.jar
===================================================================
(Binary files differ)
Property changes on: examples/trunk/wicket/gae/war/WEB-INF/lib/slf4j-api-1.4.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: examples/trunk/wicket/gae/war/WEB-INF/lib/slf4j-jdk14-1.4.2.jar
===================================================================
(Binary files differ)
Property changes on: examples/trunk/wicket/gae/war/WEB-INF/lib/slf4j-jdk14-1.4.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: examples/trunk/wicket/gae/war/WEB-INF/lib/webbeans-tomcat-1.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: examples/trunk/wicket/gae/war/WEB-INF/lib/webbeans-tomcat-1.0.0-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: examples/trunk/wicket/gae/war/WEB-INF/lib/webbeans-wicket-1.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: examples/trunk/wicket/gae/war/WEB-INF/lib/webbeans-wicket-1.0.0-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: examples/trunk/wicket/gae/war/WEB-INF/lib/wicket-1.3-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: examples/trunk/wicket/gae/war/WEB-INF/lib/wicket-1.3-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: examples/trunk/wicket/gae/war/WEB-INF/logging.properties
===================================================================
--- examples/trunk/wicket/gae/war/WEB-INF/logging.properties (rev 0)
+++ examples/trunk/wicket/gae/war/WEB-INF/logging.properties 2009-04-16 17:35:33 UTC (rev 2441)
@@ -0,0 +1,28 @@
+# A default java.util.logging configuration.
+# (All App Engine logging is through java.util.logging by default).
+#
+# To use this configuration, copy it into your application's WEB-INF
+# folder and add the following to your appengine-web.xml:
+#
+# <system-properties>
+# <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
+# </system-properties>
+#
+
+# Set the default logging level for all loggers to WARNING
+.level = WARNING
+
+# Set the default logging level for ORM, specifically, to WARNING
+DataNucleus.JDO.level=WARNING
+DataNucleus.Persistence.level=WARNING
+DataNucleus.Cache.level=WARNING
+DataNucleus.MetaData.level=WARNING
+DataNucleus.General.level=WARNING
+DataNucleus.Utility.level=WARNING
+DataNucleus.Transaction.level=WARNING
+DataNucleus.Datastore.level=WARNING
+DataNucleus.ClassLoading.level=WARNING
+DataNucleus.Plugin.level=WARNING
+DataNucleus.ValueGeneration.level=WARNING
+DataNucleus.Enhancer.level=WARNING
+DataNucleus.SchemaTool.level=WARNING
Added: examples/trunk/wicket/gae/war/WEB-INF/web.xml
===================================================================
--- examples/trunk/wicket/gae/war/WEB-INF/web.xml (rev 0)
+++ examples/trunk/wicket/gae/war/WEB-INF/web.xml 2009-04-16 17:35:33 UTC (rev 2441)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <display-name>webbeans-numberguess-wicket</display-name>
+
+ <filter>
+ <filter-name>wicket.numberguess-example</filter-name>
+ <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
+ <init-param>
+ <param-name>applicationClassName</param-name>
+ <param-value>org.jboss.webbeans.examples.wicket.SampleApplication</param-value>
+ </init-param>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>wicket.numberguess-example</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <listener>
+ <listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-class>
+ </listener>
+
+
+</web-app>
Property changes on: examples/trunk/wicket/gae/war/WEB-INF/web.xml
___________________________________________________________________
Name: svn:executable
+ *
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2440 - in examples/trunk/wicket: numberguess and 1 other directory.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-16 12:55:08 -0400 (Thu, 16 Apr 2009)
New Revision: 2440
Modified:
examples/trunk/wicket/conversations/
examples/trunk/wicket/conversations/pom.xml
examples/trunk/wicket/conversations/readme.txt
examples/trunk/wicket/numberguess/
examples/trunk/wicket/numberguess/pom.xml
examples/trunk/wicket/numberguess/readme.txt
Log:
minor
Property changes on: examples/trunk/wicket/conversations
___________________________________________________________________
Name: svn:ignore
+
target
.classpath
.settings
.project
Modified: examples/trunk/wicket/conversations/pom.xml
===================================================================
--- examples/trunk/wicket/conversations/pom.xml 2009-04-16 16:39:24 UTC (rev 2439)
+++ examples/trunk/wicket/conversations/pom.xml 2009-04-16 16:55:08 UTC (rev 2440)
@@ -11,7 +11,7 @@
</parent>
<groupId>org.jboss.webbeans.examples</groupId>
- <artifactId>wicket-conversations</artifactId>
+ <artifactId>webbeans-wicket-conversations</artifactId>
<packaging>war</packaging>
<name>Web Beans Examples: Conversations with Wicket</name>
Modified: examples/trunk/wicket/conversations/readme.txt
===================================================================
--- examples/trunk/wicket/conversations/readme.txt 2009-04-16 16:39:24 UTC (rev 2439)
+++ examples/trunk/wicket/conversations/readme.txt 2009-04-16 16:55:08 UTC (rev 2440)
@@ -1,16 +1,20 @@
-This example is similar to its sibling "conversations" example, but implemented with wicket
-and the wicket-webbeans integration. It also follows the wicket standard usage of running from
-within eclipse with jetty. So, for example, to run the app, right-click on Start.java in
-the project and choos "Run as Java Application," which will launch jetty with the example. Then hit http://localhost:8080/
+This example is similar to its sibling "conversations" example, but implemented
+with wicket and the wicket-webbeans integration. It also follows the wicket
+standard usage of running from within eclipse with jetty. So, for example, to
+run the app, right-click on Start.java in the project and choose "Run as Java
+Application," which will launch jetty with the example. Then hit
+http://localhost:8080/
-Note that conversational behavior for wicket is different than that of jsf. Roughly:
+Note that conversational behavior for wicket is different than that of jsf.
+Roughly:
- Conversations are started/ended in the same way, with Conversation.begin/end
-- Conversations are by default propagated to new PageTargets, whether directly instantiated
-or created with boomkarkable mounts. In the former case, the new Page instance will have the
-conversation id embedded in its page metadata. In the latter, a "cid" parameter is passed along.
+- Conversations are by default propagated to new PageTargets, whether directly
+instantiated or created with boomkarkable mounts. In the former case, the new
+Page instance will have the conversation id embedded in its page metadata. In
+the latter, a "cid" parameter is passed along.
- To switch a conversation, you need to explicitly pass the cid in wicket
RequestParameters. See the example.
Property changes on: examples/trunk/wicket/numberguess
___________________________________________________________________
Name: svn:ignore
+
.classpath
.settings
.project
target
Modified: examples/trunk/wicket/numberguess/pom.xml
===================================================================
--- examples/trunk/wicket/numberguess/pom.xml 2009-04-16 16:39:24 UTC (rev 2439)
+++ examples/trunk/wicket/numberguess/pom.xml 2009-04-16 16:55:08 UTC (rev 2440)
@@ -11,7 +11,7 @@
</parent>
<groupId>org.jboss.webbeans.examples</groupId>
- <artifactId>wicket-numberguess</artifactId>
+ <artifactId>webbeans-wicket-numberguess</artifactId>
<packaging>war</packaging>
<name>Web Beans Examples: Numberguess with wicket</name>
Modified: examples/trunk/wicket/numberguess/readme.txt
===================================================================
--- examples/trunk/wicket/numberguess/readme.txt 2009-04-16 16:39:24 UTC (rev 2439)
+++ examples/trunk/wicket/numberguess/readme.txt 2009-04-16 16:55:08 UTC (rev 2440)
@@ -1,6 +1,8 @@
-This example is similar to its sibling "numberguess" example, but implemented with wicket
-and the wicket-webbeans integration. It also follows the wicket standard usage of running from
-within eclipse with jetty. So, for example, to run the app, right-click on Start.java in
-the project and choos "Run as Java Application," which will launch jetty with the example. Then hit http://localhost:8080/
+This example is similar to its sibling "numberguess" example, but implemented
+with wicket and the wicket-webbeans integration. It also follows the wicket
+standard usage of running from within eclipse with jetty. So, for example, to
+run the app, right-click on Start.java in the project and choose "Run as Java
+Application," which will launch jetty with the example. Then hit
+http://localhost:8080/
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2439 - in examples/trunk: wicket and 1 other directory.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-16 12:39:24 -0400 (Thu, 16 Apr 2009)
New Revision: 2439
Added:
examples/trunk/wicket/
examples/trunk/wicket/conversations/
examples/trunk/wicket/numberguess/
Removed:
examples/trunk/wicket-conversations/
examples/trunk/wicket-numberguess/
Modified:
examples/trunk/pom.xml
Log:
move wicket examples to wicket dir
Modified: examples/trunk/pom.xml
===================================================================
--- examples/trunk/pom.xml 2009-04-16 15:20:51 UTC (rev 2438)
+++ examples/trunk/pom.xml 2009-04-16 16:39:24 UTC (rev 2439)
@@ -52,6 +52,8 @@
<module>login</module>
<module>conversations</module>
<module>se/numberguess</module>
+ <module>wicket/numberguess</module>
+ <module>wicket/conversations</module>
</modules>
<build>
Copied: examples/trunk/wicket/conversations (from rev 2438, examples/trunk/wicket-conversations)
Copied: examples/trunk/wicket/numberguess (from rev 2438, examples/trunk/wicket-numberguess)
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2438 - tck/trunk/interceptor.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-16 11:20:51 -0400 (Thu, 16 Apr 2009)
New Revision: 2438
Modified:
tck/trunk/interceptor/
Log:
minor
Property changes on: tck/trunk/interceptor
___________________________________________________________________
Name: svn:ignore
-
> .classpath
> .project
> .settings
> target
+
.classpath
.project
.settings
target
16 years, 12 months