Weld SVN: r5293 - archetypes/trunk.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-12-15 01:07:38 -0500 (Tue, 15 Dec 2009)
New Revision: 5293
Modified:
archetypes/trunk/pom.xml
Log:
upgrade to weld-parent:8
Modified: archetypes/trunk/pom.xml
===================================================================
--- archetypes/trunk/pom.xml 2009-12-15 06:01:36 UTC (rev 5292)
+++ archetypes/trunk/pom.xml 2009-12-15 06:07:38 UTC (rev 5293)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>7</version>
+ <version>8</version>
</parent>
<repositories>
<repository>
14 years, 11 months
Weld SVN: r5292 - build/trunk/parent.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-12-15 01:01:36 -0500 (Tue, 15 Dec 2009)
New Revision: 5292
Modified:
build/trunk/parent/
Log:
ignore target
Property changes on: build/trunk/parent
___________________________________________________________________
Name: svn:ignore
+ target
14 years, 11 months
Weld SVN: r5290 - build/tags.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-12-15 00:46:16 -0500 (Tue, 15 Dec 2009)
New Revision: 5290
Added:
build/tags/weld-parent-8/
Log:
[maven-scm] copy for tag weld-parent-8
Copied: build/tags/weld-parent-8 (from rev 5289, build/trunk/parent)
14 years, 11 months
Weld SVN: r5288 - core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy.
by weld-commits＠lists.jboss.org
Author: marius.bogoevici
Date: 2009-12-15 00:09:58 -0500 (Tue, 15 Dec 2009)
New Revision: 5288
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/DecoratorProxyMethodHandler.java
Log:
Use Reflections.invoke
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/DecoratorProxyMethodHandler.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/DecoratorProxyMethodHandler.java 2009-12-15 05:07:47 UTC (rev 5287)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/DecoratorProxyMethodHandler.java 2009-12-15 05:09:58 UTC (rev 5288)
@@ -17,7 +17,6 @@
package org.jboss.weld.bean.proxy;
import static org.jboss.weld.logging.messages.BeanMessage.UNEXPECTED_UNWRAPPED_CUSTOM_DECORATOR;
-import static org.jboss.weld.util.reflection.Reflections.ensureAccessible;
import java.lang.reflect.Method;
import java.util.List;
@@ -32,6 +31,7 @@
import org.jboss.weld.introspector.WeldMethod;
import org.jboss.weld.introspector.jlr.MethodSignatureImpl;
import org.jboss.weld.serialization.spi.helpers.SerializableContextualInstance;
+import org.jboss.weld.util.reflection.Reflections;
/**
* Method handler for decorated beans
@@ -82,6 +82,7 @@
for (SerializableContextualInstance<Decorator<Object>, Object> beanInstance : decoratorInstances)
{
WeldMethod<?, ?> decoratorMethod;
+
if (beanInstance.getContextual().get() instanceof DecoratorImpl<?>)
{
decoratorMethod = ((DecoratorImpl<?>)beanInstance.getContextual().get()).getAnnotatedItem().getWeldMethod(methodSignature);
@@ -100,6 +101,6 @@
}
}
- return ensureAccessible(method).invoke(getTargetInstance(), args);
+ return Reflections.invoke(method,getTargetInstance(), args);
}
}
14 years, 11 months
Weld SVN: r5287 - core/trunk/tests/src/test/java/org/jboss/weld/tests/generic.
by weld-commits＠lists.jboss.org
Author: marius.bogoevici
Date: 2009-12-15 00:07:47 -0500 (Tue, 15 Dec 2009)
New Revision: 5287
Added:
core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BaseClass.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BoundedGenericBean.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/Subclass.java
Modified:
core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBeanTest.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/TestBean.java
Log:
Adding more tests for WELD-339
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BaseClass.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BaseClass.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BaseClass.java 2009-12-15 05:07:47 UTC (rev 5287)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright <Year>, 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.
+ */
+
+package org.jboss.weld.tests.generic;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class BaseClass
+{
+}
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BoundedGenericBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BoundedGenericBean.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/BoundedGenericBean.java 2009-12-15 05:07:47 UTC (rev 5287)
@@ -0,0 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright <Year>, 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.
+ */
+
+package org.jboss.weld.tests.generic;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class BoundedGenericBean<T extends BaseClass>
+{
+ public T echo (T param) {
+ return param;
+ }
+}
Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBeanTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBeanTest.java 2009-12-15 05:05:36 UTC (rev 5286)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBeanTest.java 2009-12-15 05:07:47 UTC (rev 5287)
@@ -18,7 +18,6 @@
package org.jboss.weld.tests.generic;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.jboss.weld.test.AbstractWeldTest;
import org.testng.annotations.Test;
@@ -35,5 +34,11 @@
TestBean testBean = getCurrentManager().getInstanceByType(TestBean.class);
assert "Hello".equals(testBean.echo("Hello"));
assert Integer.valueOf(1).equals(testBean.echo(1));
+ Subclass subclassInstance = new Subclass();
+ assert subclassInstance == testBean.echo(subclassInstance);
+ assert subclassInstance == testBean.echo((BaseClass)subclassInstance);
+ BaseClass baseInstance = new BaseClass();
+ assert baseInstance == testBean.echo(baseInstance);
}
+
}
\ No newline at end of file
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/Subclass.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/Subclass.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/Subclass.java 2009-12-15 05:07:47 UTC (rev 5287)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright <Year>, 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.
+ */
+
+package org.jboss.weld.tests.generic;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class Subclass extends BaseClass
+{
+
+}
Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/TestBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/TestBean.java 2009-12-15 05:05:36 UTC (rev 5286)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/TestBean.java 2009-12-15 05:07:47 UTC (rev 5287)
@@ -28,6 +28,11 @@
@Inject GenericInterface<Integer> genericIntegerField;
+ @Inject BoundedGenericBean<Subclass> boundedGenericSubclassField;
+
+ @Inject BoundedGenericBean<BaseClass> boundedGenericBaseField;
+
+
public String echo(String param)
{
return genericStringField.echo(param);
@@ -37,5 +42,15 @@
{
return genericIntegerField.echo(param);
}
+
+ public Subclass echo (Subclass param)
+ {
+ return boundedGenericSubclassField.echo(param);
+ }
+
+ public BaseClass echo (BaseClass param)
+ {
+ return boundedGenericBaseField.echo(param);
+ }
}
14 years, 11 months
Weld SVN: r5286 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: lookup/typesafe/resolution and 1 other directory.
by weld-commits＠lists.jboss.org
Author: marius.bogoevici
Date: 2009-12-15 00:05:36 -0500 (Tue, 15 Dec 2009)
New Revision: 5286
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/FunnelWeaver.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnimalFarmer.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cat.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DomesticCat.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Emu.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FlightlessBird.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Lion.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java
Log:
CDITCK-84. Adding constructors to generic classes in order to avoid ambiguous definitions.
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/FunnelWeaver.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/FunnelWeaver.java 2009-12-14 19:09:35 UTC (rev 5285)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/FunnelWeaver.java 2009-12-15 05:05:36 UTC (rev 5286)
@@ -1,6 +1,14 @@
package org.jboss.jsr299.tck.tests.implementation.producer.method.definition;
+import javax.enterprise.inject.Alternative;
+
class FunnelWeaver<T>
{
+ String name;
+
+ FunnelWeaver(String name)
+ {
+ this.name = name;
+ }
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java 2009-12-14 19:09:35 UTC (rev 5285)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java 2009-12-15 05:05:36 UTC (rev 5286)
@@ -28,7 +28,7 @@
@Produces public FunnelWeaver<Spider> getFunnelWeaverSpider()
{
- return new FunnelWeaver<Spider>();
+ return new FunnelWeaver<Spider>("Weaver");
}
@Produces public Animal makeASpider()
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnimalFarmer.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnimalFarmer.java 2009-12-14 19:09:35 UTC (rev 5285)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnimalFarmer.java 2009-12-15 05:05:36 UTC (rev 5286)
@@ -2,5 +2,8 @@
class AnimalFarmer extends Farmer<Animal>
{
-
+ AnimalFarmer()
+ {
+ super("AnimalFarmer");
+ }
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cat.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cat.java 2009-12-14 19:09:35 UTC (rev 5285)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cat.java 2009-12-15 05:05:36 UTC (rev 5286)
@@ -2,5 +2,10 @@
public class Cat<T>
{
+ String name;
+ public Cat(String name)
+ {
+ this.name = name;
+ }
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DomesticCat.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DomesticCat.java 2009-12-14 19:09:35 UTC (rev 5285)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DomesticCat.java 2009-12-15 05:05:36 UTC (rev 5286)
@@ -6,7 +6,7 @@
public DomesticCat(String name)
{
- // TODO Auto-generated constructor stub
+ super(name);
}
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Emu.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Emu.java 2009-12-14 19:09:35 UTC (rev 5285)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Emu.java 2009-12-15 05:05:36 UTC (rev 5286)
@@ -5,5 +5,8 @@
@Typed(FlightlessBird.class)
public class Emu extends FlightlessBird<Australian>
{
-
+ public Emu()
+ {
+ super("Emu");
+ }
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java 2009-12-14 19:09:35 UTC (rev 5285)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java 2009-12-15 05:05:36 UTC (rev 5286)
@@ -2,5 +2,11 @@
class Farmer<T>
{
+ String name;
+ Farmer(String name)
+ {
+ this.name = name;
+ }
+
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FlightlessBird.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FlightlessBird.java 2009-12-14 19:09:35 UTC (rev 5285)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FlightlessBird.java 2009-12-15 05:05:36 UTC (rev 5286)
@@ -3,4 +3,11 @@
public class FlightlessBird<T>
{
+ String name;
+
+ public FlightlessBird(String name)
+ {
+ this.name = name;
+ }
+
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Lion.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Lion.java 2009-12-14 19:09:35 UTC (rev 5285)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Lion.java 2009-12-15 05:05:36 UTC (rev 5286)
@@ -5,7 +5,7 @@
public Lion(String name)
{
- // TODO Auto-generated constructor stub
+ super(name);
}
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java 2009-12-14 19:09:35 UTC (rev 5285)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java 2009-12-15 05:05:36 UTC (rev 5286)
@@ -2,5 +2,8 @@
class ScottishFishFarmer extends Farmer<ScottishFish>
{
-
+ ScottishFishFarmer()
+ {
+ super("ScottishFishFarmer");
+ }
}
14 years, 11 months
Weld SVN: r5285 - in archetypes/trunk/jsf/jee-minimal/src/main/resources: archetype-resources/src/main/webapp and 5 other directories.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-12-14 14:09:35 -0500 (Mon, 14 Dec 2009)
New Revision: 5285
Added:
archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tmpl/
archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tmpl/default.xhtml
archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/
archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/css/
archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css
archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/
archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/banner.png
archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/weld.png
Modified:
archetypes/trunk/jsf/jee-minimal/src/main/resources/META-INF/archetype.xml
archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
Log:
add pretty index page
Modified: archetypes/trunk/jsf/jee-minimal/src/main/resources/META-INF/archetype.xml
===================================================================
--- archetypes/trunk/jsf/jee-minimal/src/main/resources/META-INF/archetype.xml 2009-12-14 19:09:11 UTC (rev 5284)
+++ archetypes/trunk/jsf/jee-minimal/src/main/resources/META-INF/archetype.xml 2009-12-14 19:09:35 UTC (rev 5285)
@@ -2,11 +2,14 @@
<archetype>
<id>weld-archetype-jee-minimal-quickstart</id>
<resources>
+ <resource>src/main/resources/META-INF/beans.xml</resource>
<resource>src/main/webapp/index.xhtml</resource>
- <resource>src/main/webapp/index.jsp</resource>
+ <resource>src/main/webapp/resources/css/screen.css</resource>
+ <resource filtered="false">src/main/webapp/resources/gfx/banner.png</resource>
+ <resource filtered="false">src/main/webapp/resources/gfx/weld.png</resource>
<resource>src/main/webapp/WEB-INF/web.xml</resource>
<resource>src/main/webapp/WEB-INF/faces-config.xml</resource>
- <resource>src/main/resources/META-INF/beans.xml</resource>
+ <resource>src/main/webapp/WEB-INF/tmpl/default.xhtml</resource>
<resource>src/main/webapp/META-INF/context.xml</resource>
</resources>
<sources>
Added: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tmpl/default.xhtml
===================================================================
--- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tmpl/default.xhtml (rev 0)
+++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tmpl/default.xhtml 2009-12-14 19:09:35 UTC (rev 5285)
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+ <h:head>
+ <title>Java EE 6 Starter Application</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <h:outputStylesheet name="css/screen.css"/>
+ </h:head>
+ <h:body>
+ <div id="container">
+ <div id="content">
+ <div id="sidebar">
+ <h3>Learn more</h3>
+ <p>
+ Learn more about Java EE 6 and the extensions provided by Weld and Seam.
+ </p>
+ <ul>
+ <li><a href="http://seamframework.org/Weld/JSR299AndWeldOverview">Overview</a></li>
+ <li><a href="http://seamframework.org">Project website</a></li>
+ <li><a href="http://seamframework.org/Documentation/SeamDocumentation#H-WeldReferenceD...">Documentation</a></li>
+ <li><a href="http://seamframework.org/Community/Forums">User forums</a></li>
+ <li><a href="http://seamframework.org/Community/MailingLists">Mailing lists</a></li>
+ <li><a href="https://jira.jboss.org/jira/browse/WELD">Issue tracker</a></li>
+ </ul>
+ <p>
+ If you have an add-on, please <a href="http://seamframework.org/Community/Forums">let us know</a> and
+ consider <a href="http://seamframework.org/Community/Contribute">contributing</a> it back to the
+ community!
+ </p>
+ </div>
+ <ui:insert name="content">
+ [Template content will be inserted here]
+ </ui:insert>
+ </div>
+ <div id="footer">
+ <h:graphicImage value="/resources/gfx/weld.png" alt="Weld logo"/>
+ <p>Weld is an open source (Apache License, Version 2.0) implementation of CDI.</p>
+ </div>
+ </div>
+ </h:body>
+</html>
Modified: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
===================================================================
--- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2009-12-14 19:09:11 UTC (rev 5284)
+++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2009-12-14 19:09:35 UTC (rev 5285)
@@ -33,7 +33,7 @@
<param-value>true</param-value>
</context-param>
- <!-- Optional. Sets default document name. -->
+ <!-- Optional. Sets default document name. -->
<welcome-file-list>
<welcome-file>index.jsf</welcome-file>
</welcome-file-list>
Modified: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
===================================================================
--- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml 2009-12-14 19:09:11 UTC (rev 5284)
+++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml 2009-12-14 19:09:35 UTC (rev 5285)
@@ -1,16 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html">
- <h:head>
- <title>Java EE 6 Starter Application</title>
- </h:head>
- <h:body>
+ xmlns:h="http://java.sun.com/jsf/html"
+ template="/WEB-INF/tmpl/default.xhtml">
+ <ui:define name="content">
<h1>Hello World!</h1>
- <p>My CDI bean says <span style="color: blue;">#{helloWorld.text}</span> using the Unified EL.</p>
+ <p>Your CDI bean <code>HelloWorld</code> says <span style="color: blue;">#{helloWorld.text}</span> using the Unified EL.</p>
- <h:form>
+ <h:form id="bv">
<h2>Bean Validation examples</h2>
<p>Enforces annotation-based constraints defined on the model class.</p>
<table>
@@ -20,16 +18,16 @@
</th>
<td>
<h:inputText id="letters" value="#{helloWorld.letters}"/>
- <h:message for="letters" style="color: red;"/>
+ <h:message for="letters" errorClass="invalid"/>
</td>
</tr>
<tr>
<th style="text-align: right;">
- <h:outputLabel for="numbers" value="Numbers (max two digits):"/>
+ <h:outputLabel for="numbers" value="Numbers:"/>
</th>
<td>
<h:inputText id="numbers" value="#{helloWorld.numbers}"/>
- <h:message for="numbers" style="color: red;"/>
+ <h:message for="numbers" errorClass="invalid"/>
</td>
</tr>
<tr>
@@ -38,14 +36,14 @@
</th>
<td>
<h:inputText id="email" value="#{helloWorld.email}"/>
- <h:message for="email" style="color: red;"/>
+ <h:message for="email" errorClass="invalid"/>
</td>
</tr>
</table>
<p>
- <h:commandButton action="check" value="Check"/>
+ <h:commandButton id="check" action="check" value="Check values"/>
<h:outputText value=" All clear!" rendered="#{facesContext.postback and empty facesContext.messageList}" style="color: green;"/>
</p>
</h:form>
- </h:body>
-</html>
+ </ui:define>
+</ui:composition>
Added: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css
===================================================================
--- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css (rev 0)
+++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css 2009-12-14 19:09:35 UTC (rev 5285)
@@ -0,0 +1,39 @@
+body {
+ margin: 0;
+ padding: 0;
+ background-color: #EAECEE;
+ font-family: Verdana, sans-serif;
+ font-size: 0.9em;
+}
+#container {
+ margin: 0 auto;
+ padding: 0 20px 10px 20px;
+ border: 1px solid #666666;
+ width: 865px; /* subtract 40px from banner width for padding */
+ background: #FFFFFF url(#{request.contextPath}/resources/gfx/banner.png) no-repeat;
+ padding-top: 110px;
+}
+#sidebar {
+ font-size: 0.9em;
+ width: 225px;
+ float: right;
+ border: 1px solid #666666;
+ background: #EAECEE;
+ padding: 0 15px 5px 15px;
+}
+#sidebar ul {
+ padding-left: 30px;
+}
+#footer {
+ clear: both;
+ text-align: center;
+ color: #666666;
+ font-size: 0.85em;
+}
+code {
+ font-size: 1.1em;
+}
+span.invalid {
+ padding-left: 3px;
+ color: red;
+}
\ No newline at end of file
Added: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/banner.png
===================================================================
(Binary files differ)
Property changes on: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/banner.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/weld.png
===================================================================
(Binary files differ)
Property changes on: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/weld.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 11 months
Weld SVN: r5284 - in archetypes/trunk/jsf: jee-minimal and 1 other directories.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-12-14 14:09:11 -0500 (Mon, 14 Dec 2009)
New Revision: 5284
Modified:
archetypes/trunk/jsf/jee-minimal/pom.xml
archetypes/trunk/jsf/jee/pom.xml
archetypes/trunk/jsf/servlet-minimal/pom.xml
Log:
description
Modified: archetypes/trunk/jsf/jee/pom.xml
===================================================================
--- archetypes/trunk/jsf/jee/pom.xml 2009-12-14 19:08:39 UTC (rev 5283)
+++ archetypes/trunk/jsf/jee/pom.xml 2009-12-14 19:09:11 UTC (rev 5284)
@@ -10,8 +10,8 @@
<groupId>org.jboss.weld.archetypes</groupId>
<artifactId>weld-jsf-jee</artifactId>
- <description>A full Java EE 6 project => JSF 2.0, CDI 1.0, EJB 3.1, JPA 2.0; uses Weld for build dependency management</description>
<name>Java EE 6 Archetype</name>
+ <description>Weld archetype for creating a Java EE 6 application using JSF 2.0, CDI 1.0, EJB 3.1 and JPA 2.0 (persistence unit included)</description>
<packaging>maven-archetype</packaging>
Modified: archetypes/trunk/jsf/jee-minimal/pom.xml
===================================================================
--- archetypes/trunk/jsf/jee-minimal/pom.xml 2009-12-14 19:08:39 UTC (rev 5283)
+++ archetypes/trunk/jsf/jee-minimal/pom.xml 2009-12-14 19:09:11 UTC (rev 5284)
@@ -10,8 +10,8 @@
<groupId>org.jboss.weld.archetypes</groupId>
<artifactId>weld-jsf-jee-minimal</artifactId>
- <description>A minimal Java EE 6 project => JSF 2.0 and CDI 1.0, no persistence; uses Weld for build dependency management</description>
<name>Minimal Java EE 6 Archteype</name>
+ <description>Weld archetype for creating a minimal Java EE 6 application using JSF 2.0 and CDI 1.0 (no persistence unit)</description>
<packaging>maven-archetype</packaging>
Modified: archetypes/trunk/jsf/servlet-minimal/pom.xml
===================================================================
--- archetypes/trunk/jsf/servlet-minimal/pom.xml 2009-12-14 19:08:39 UTC (rev 5283)
+++ archetypes/trunk/jsf/servlet-minimal/pom.xml 2009-12-14 19:09:11 UTC (rev 5284)
@@ -12,7 +12,7 @@
<groupId>org.jboss.weld.archetypes</groupId>
<artifactId>weld-jsf-servlet-minimal</artifactId>
<name>Weld JSF/Servlet Archetype</name>
- <description>A JSF 2.0 and CDI 1.0 project for Servlet Containers such as Tomcat 6 and Jetty 6</description>
+ <description>Weld archetype for creating an application using JSF 2.0 and CDI 1.0 for Servlet Containers (Tomcat 6 / Jetty 6)</description>
<packaging>maven-archetype</packaging>
14 years, 11 months