[webbeans-commits] Webbeans SVN: r2457 - doc/trunk/reference/en-US.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-04-17 06:20:14 -0400 (Fri, 17 Apr 2009)
New Revision: 2457
Modified:
doc/trunk/reference/en-US/extensions.xml
Log:
Added some paragraphs for logger annotation extension.
Modified: doc/trunk/reference/en-US/extensions.xml
===================================================================
--- doc/trunk/reference/en-US/extensions.xml 2009-04-17 09:17:05 UTC (rev 2456)
+++ doc/trunk/reference/en-US/extensions.xml 2009-04-17 10:20:14 UTC (rev 2457)
@@ -15,9 +15,45 @@
<title>Web Beans Logger</title>
<para>
- TODO
+ Adding logging to your application is now even easier with simple injection
+ of a logger object into any JSR-299 bean. Simply annotate a
+ org.jboss.webbeans.log.Log type member with <emphasis>@Logger</emphasis>
+ and an appropriate logger object will be injected into any instance of
+ the bean.
</para>
+ <programlisting role="JAVA"><![CDATA[public class Checkout {
+ import org.jboss.webbeans.annotation.Logger;
+ import org.jboss.webbeans.log.Log;
+
+ @Logger
+ private Log log;
+
+ void invoiceItems() {
+ ShoppingCart cart;
+ . . .
+ log.debug("Items invoiced for {0}", cart);
+ }
+
+}]]></programlisting>
+
+ <para>
+ The example shows how objects can be interpolated into a message. This
+ interpolation is done using <emphasis>java.text.MessageFormat</emphasis>,
+ so see the JavaDoc for that class for more details. In this case,
+ the ShoppingCart should have implemented the <emphasis>toString()</emphasis>
+ method to produce a human readable value that is meaningful in messages.
+ Normally, this call would have involved evaluating cart.toString()
+ with String concatenation to produce a single String argument. Thus it was
+ necessary to surround the call with an if-statement using the condition
+ <emphasis>log.isDebugEnabled()</emphasis> to avoid the expensive String
+ concatenation if the message was not actually going to be used. However,
+ when using @Logger injected logging, the conditional test can be left out
+ since the object arguments are not evaluated unless the message is going to
+ be logged.
+ </para>
+
+
</section>
<section>
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2456 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/xml/resource/constant and 3 other directories.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-04-17 05:17:05 -0400 (Fri, 17 Apr 2009)
New Revision: 2456
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/InjectionOfPrimitiveResourceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/SimpleBean.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/web.xml
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java
Log:
Additional test for injection of an environment entry as resource.
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/InjectionOfPrimitiveResourceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/InjectionOfPrimitiveResourceTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/InjectionOfPrimitiveResourceTest.java 2009-04-17 09:17:05 UTC (rev 2456)
@@ -0,0 +1,38 @@
+package org.jboss.jsr299.tck.tests.xml.resource.constant;
+
+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;
+
+@Artifact
+(a)Packaging(PackagingType.WAR)
+@IntegrationTest
+@Resources({
+ @Resource(source="web.xml", destination="WEB-INF/web.xml")
+})
+@BeansXml("beans.xml")
+public class InjectionOfPrimitiveResourceTest extends AbstractJSR299Test
+{
+ @Test(groups = { "xml", "broken" })
+ @SpecAssertions( {
+ @SpecAssertion(section = "6.9", id = "f"),
+ @SpecAssertion(section = "3.6", id = "a"),
+ @SpecAssertion(section = "3.6", id = "f"),
+ @SpecAssertion(section = "3.6.1", id = "a"),
+ @SpecAssertion(section = "3.6.1", id = "f")
+ })
+ public void testInjectionOfSimpleResource()
+ {
+ SimpleBean bean = getCurrentManager().getInstanceByType(SimpleBean.class);
+ assert bean.getInjectedCode() != null : "Integer code was not injected into bean";
+ assert bean.getInjectedCode() == 42 : "Wrong code value injected into bean";
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/InjectionOfPrimitiveResourceTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/SimpleBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/SimpleBean.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/SimpleBean.java 2009-04-17 09:17:05 UTC (rev 2456)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.tests.xml.resource.constant;
+
+public class SimpleBean
+{
+ private Integer injectedCode = null;
+
+ public Integer getInjectedCode()
+ {
+ return injectedCode;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/SimpleBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: 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 2009-04-17 09:03:46 UTC (rev 2455)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java 2009-04-17 09:17:05 UTC (rev 2456)
@@ -49,7 +49,10 @@
@Test(groups = { "xml", "broken" })
@SpecAssertions( {
@SpecAssertion(section = "6.9", id = "i"),
- @SpecAssertion(section = "3.6", id = "d")
+ @SpecAssertion(section = "3.6", id = "d"),
+ @SpecAssertion(section = "3.6", id = "i"),
+ @SpecAssertion(section = "3.6.1", id = "d"),
+ @SpecAssertion(section = "3.6.1", id = "i")
})
public void testEjbInjectionByXml()
{
Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/beans.xml (from rev 2453, 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/constant/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/beans.xml 2009-04-17 09:17:05 UTC (rev 2456)
@@ -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>
+ <Resource>
+ <name>AnswerToLife</name>
+ </Resource>
+ </test:SimpleBean>
+</Beans>
Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/web.xml (from rev 2453, 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/constant/web.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/web.xml 2009-04-17 09:17:05 UTC (rev 2456)
@@ -0,0 +1,26 @@
+<?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>
+
+ <!-- resource-ref>
+ <res-ref-name>AnswerToLife</res-ref-name>
+ <res-type>java.lang.Integer</res-type>
+ <mapped-name>constants/AnswerToLife</mapped-name>
+ </resource-ref -->
+
+ <env-entry>
+ <env-entry-name>AnswerToLife</env-entry-name>
+ <env-entry-type>java.lang.Integer</env-entry-type>
+ <env-entry-value>42</env-entry-value>
+ <mapped-name>constants/AnswerToLife</mapped-name>
+ </env-entry>
+
+ <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
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2455 - ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext.
by webbeans-commits＠lists.jboss.org
Author: vitold
Date: 2009-04-17 05:03:46 -0400 (Fri, 17 Apr 2009)
New Revision: 2455
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java
Log:
minor
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-17 08:43:16 UTC (rev 2454)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java 2009-04-17 09:03:46 UTC (rev 2455)
@@ -166,7 +166,10 @@
}
if(beanChildClass.isAnnotationPresent(BindingType.class) || beanChildClass.isAnnotationPresent(InterceptorBindingType.class) ||
beanChildClass.isAnnotationPresent(Stereotype.class) || beanChildClass.isAnnotationPresent(Named.class) ||
- beanChildClass.isAnnotationPresent(Specializes.class) || beanChildClass.isAnnotationPresent(Realizes.class) ||
+ beanChildClass.isAnnotationPresent(Specializes.class) || beanChildClass.isAnnotationPresent(Realizes.class) ||
+ beanChildClass.getRawType().equals(BindingType.class) || beanChildClass.getRawType().equals(InterceptorBindingType.class) ||
+ beanChildClass.getRawType().equals(Stereotype.class) || beanChildClass.getRawType().equals(Named.class) ||
+ beanChildClass.getRawType().equals(Specializes.class) || beanChildClass.getRawType().equals(Realizes.class) ||
beanChildClass.isAnnotationPresent(Resource.class) || beanChildClass.isAnnotationPresent(EJB.class) ||
beanChildClass.isAnnotationPresent(WebServiceRef.class) || beanChildClass.isAnnotationPresent(PersistenceContext.class) ||
beanChildClass.isAnnotationPresent(PersistenceUnit.class))
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2454 - in ri/trunk: tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser and 5 other directories.
by webbeans-commits＠lists.jboss.org
Author: vitold
Date: 2009-04-17 04:43:16 -0400 (Fri, 17 Apr 2009)
New Revision: 2454
Added:
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/beans.xml
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/namespace
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/not-valid-beans.xml
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/notvalid/
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/notvalid/schema.xsd
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/schema.xsd
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/valid/
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/valid/schema.xsd
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.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
Log:
add RI unit test showing that multiple schemas can be validated
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java 2009-04-16 21:23:42 UTC (rev 2453)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java 2009-04-17 08:43:16 UTC (rev 2454)
@@ -123,9 +123,16 @@
{
urn = attrVal;
URL namespaceFile = environment.loadFileByUrn(urn, XmlConstants.NAMESPACE_FILE_NAME);
- if (namespaceFile == null)
- throw new DefinitionException("Could not find '" + XmlConstants.NAMESPACE_FILE_NAME + "' file according to specified URN '" + urn + "'");
- packagesSet.addAll(parseNamespaceFile(namespaceFile));
+
+ if (namespaceFile != null)
+ {
+ packagesSet.addAll(parseNamespaceFile(namespaceFile));
+ }
+ else
+ {
+ String packageName = urn.replaceFirst(XmlConstants.URN_PREFIX, "");
+ packagesSet.add(packageName);
+ }
}
if (attribute.getName().equalsIgnoreCase(XmlConstants.SCHEMA_LOCATION) && attrVal.startsWith(XmlConstants.HTTP_PREFIX) && urn.trim().length() > 0)
{
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 21:23:42 UTC (rev 2453)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-04-17 08:43:16 UTC (rev 2454)
@@ -1,18 +1,13 @@
package org.jboss.webbeans.test.unit.xml.parser;
-import java.lang.annotation.Annotation;
import java.net.URL;
import java.util.HashSet;
-import java.util.List;
import java.util.Set;
-import javax.inject.manager.Bean;
-
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Classes;
import org.jboss.testharness.impl.packaging.Resource;
import org.jboss.testharness.impl.packaging.Resources;
-import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.ejb.EjbDescriptorCache;
import org.jboss.webbeans.introspector.AnnotatedClass;
import org.jboss.webbeans.introspector.AnnotatedItem;
@@ -21,7 +16,6 @@
import org.jboss.webbeans.test.unit.xml.beans.Order;
import org.jboss.webbeans.xml.XmlEnvironment;
import org.jboss.webbeans.xml.XmlParser;
-import org.testng.annotations.Test;
@Artifact
@Resources({
@@ -53,50 +47,21 @@
assert parserEnv.getClasses().size() == 1;
}
- @Test
+// @Test
public void testDd()
{
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();
- ManagerImpl manager = parserEnv.getManager();
-
- Set<Bean<Order>> beansSet = manager.resolveByType(Order.class);
- List<Class<? extends Annotation>> dTypes = manager.getEnabledDeploymentTypes();
- for(Bean<Order> bean : beansSet)
- {
- Class<? extends Annotation> deploymentType = bean.getDeploymentType();
- System.out.println("after parsing: " + deploymentType);
- }
+// ManagerImpl manager = parserEnv.getManager();
+//
+// Set<Bean<Order>> beansSet = manager.resolveByType(Order.class);
+// List<Class<? extends Annotation>> dTypes = manager.getEnabledDeploymentTypes();
+// for(Bean<Order> bean : beansSet)
+// {
+// Class<? extends Annotation> deploymentType = bean.getDeploymentType();
+// System.out.println("after parsing: " + deploymentType);
+// }
}
-}
-
- /*
-<Beans xmlns="urn:java:ee" xmlns:myapp="urn:java:org.jboss.webbeans.test.unit.xml.beans"
- xmlns:test="urn:java:org.jboss.webbeans.test.unit.xml.parser"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:java:ee http://java.sun.com/jee/ee/schema-1.0.xsd
- urn:java:com.mydomain.myapp http://mydomain.com/myapp/schema-1.2.xsd">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
- <myapp:Order>
- <ConversationScoped />
- <myapp:PaymentProcessor>
- <myapp:Asynchronous />
- </myapp:PaymentProcessor>
- <myapp:User />
- </myapp:Order>
- <myapp:Login>
- <ConversationScoped />
- <BindingType />
- </myapp:Login>
-</Beans>
- */
+}
\ No newline at end of file
Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java 2009-04-17 08:43:16 UTC (rev 2454)
@@ -0,0 +1,44 @@
+package org.jboss.webbeans.test.unit.xml.parser.schema;
+
+import javax.inject.DefinitionException;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Classes;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
+import org.jboss.webbeans.ejb.EjbDescriptorCache;
+import org.jboss.webbeans.mock.MockXmlEnvironment;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.webbeans.test.unit.xml.beans.Order;
+import org.jboss.webbeans.xml.XmlEnvironment;
+import org.jboss.webbeans.xml.XmlParser;
+import org.testng.annotations.Test;
+
+@Artifact
+@Resources({
+ @Resource(source="/org/jboss/webbeans/test/unit/xml/parser/schema/beans.xml", destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/parser/schema/beans.xml" ),
+ @Resource(source="/org/jboss/webbeans/test/unit/xml/parser/schema/not-valid-beans.xml", destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/parser/schema/not-valid-beans.xml" )
+})
+(a)Classes({Order.class})
+public class SchemaValidationTest extends AbstractWebBeansTest
+{
+ @Test
+ public void testTwoValidSchemas()
+ {
+ XmlEnvironment parserEnv = new MockXmlEnvironment(getResources("beans.xml"), new EjbDescriptorCache());
+ XmlParser parser = new XmlParser(parserEnv);
+ parser.parse();
+
+ assert parserEnv.getManager().resolveByType(Order.class).size() == 1;
+ }
+
+ @Test(expectedExceptions = DefinitionException.class)
+ public void testOneSchemaNotValid()
+ {
+ XmlEnvironment parserEnv = new MockXmlEnvironment(getResources("not-valid-beans.xml"), new EjbDescriptorCache());
+ XmlParser parser = new XmlParser(parserEnv);
+ parser.parse();
+
+ assert false;
+ }
+}
\ No newline at end of file
Added: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/beans.xml
===================================================================
--- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/beans.xml (rev 0)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/beans.xml 2009-04-17 08:43:16 UTC (rev 2454)
@@ -0,0 +1,20 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:myapp="urn:java:org.jboss.webbeans.test.unit.xml.parser.schema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:java:org.jboss.webbeans.test.unit.xml.parser.schema.valid http://mydomain.com/myapp/schema-1.2.xsd">
+
+ <Deploy>
+ <Standard />
+ <Production />
+ <myapp:TestDeploymentType />
+ </Deploy>
+
+ <myapp:Order>
+ <Array>
+ <String />
+ </Array>
+ <myapp:getVal />
+ <myapp:val />
+ <Integer />
+ </myapp:Order>
+</Beans>
\ No newline at end of file
Added: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/namespace
===================================================================
--- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/namespace (rev 0)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/namespace 2009-04-17 08:43:16 UTC (rev 2454)
@@ -0,0 +1,2 @@
+org.jboss.webbeans.test.unit.xml.beans
+org.jboss.webbeans.test.unit.xml.beans.annotationtype
\ No newline at end of file
Added: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/not-valid-beans.xml
===================================================================
--- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/not-valid-beans.xml (rev 0)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/not-valid-beans.xml 2009-04-17 08:43:16 UTC (rev 2454)
@@ -0,0 +1,20 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:myapp="urn:java:org.jboss.webbeans.test.unit.xml.parser.schema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:java:org.jboss.webbeans.test.unit.xml.parser.schema.notvalid http://mydomain.com/myapp/schema-1.2.xsd">
+
+ <Deploy>
+ <Standard />
+ <Production />
+ <myapp:TestDeploymentType />
+ </Deploy>
+
+ <myapp:Order>
+ <Array>
+ <String />
+ </Array>
+ <myapp:getVal />
+ <myapp:val />
+ <Integer />
+ </myapp:Order>
+</Beans>
\ No newline at end of file
Added: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/notvalid/schema.xsd
===================================================================
--- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/notvalid/schema.xsd (rev 0)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/notvalid/schema.xsd 2009-04-17 08:43:16 UTC (rev 2454)
@@ -0,0 +1,10 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:java:ee">
+ <xs:element name="Beanses">
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:any namespace="##any" processContents="skip" />
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="skip" />
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
\ No newline at end of file
Added: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/schema.xsd
===================================================================
--- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/schema.xsd (rev 0)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/schema.xsd 2009-04-17 08:43:16 UTC (rev 2454)
@@ -0,0 +1,10 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:java:ee">
+ <xs:element name="Beans">
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:any namespace="##any" processContents="skip" />
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="skip" />
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
\ No newline at end of file
Added: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/valid/schema.xsd
===================================================================
--- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/valid/schema.xsd (rev 0)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/valid/schema.xsd 2009-04-17 08:43:16 UTC (rev 2454)
@@ -0,0 +1,10 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:java:ee">
+ <xs:element name="Beans">
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:any namespace="##any" processContents="skip" />
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="skip" />
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
\ 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 21:23:42 UTC (rev 2453)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml 2009-04-17 08:43:16 UTC (rev 2454)
@@ -2,8 +2,7 @@
xmlns:myapp="urn:java:org.jboss.webbeans.test.unit.xml.parser"
xmlns:manager="urn:java:javax.inject.manager"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:java:ee
- urn:java:org.jboss.webbeans.test.unit.xml.parser http://mydomain.com/myapp/schema-1.2.xsd">
+ xsi:schemaLocation="urn:java:org.jboss.webbeans.test.unit.xml.parser http://mydomain.com/myapp/schema-1.2.xsd">
<Deploy>
<Standard />
<Production />
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2453 - doc/trunk/reference/en-US.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-16 17:23:42 -0400 (Thu, 16 Apr 2009)
New Revision: 2453
Modified:
doc/trunk/reference/en-US/environments.xml
Log:
WBX-29
Modified: doc/trunk/reference/en-US/environments.xml
===================================================================
--- doc/trunk/reference/en-US/environments.xml 2009-04-16 21:06:20 UTC (rev 2452)
+++ doc/trunk/reference/en-US/environments.xml 2009-04-16 21:23:42 UTC (rev 2453)
@@ -51,23 +51,23 @@
</section>
<section>
- <title>Tomcat (or any plain Servlet container)</title>
+ <title>Servlet Containers (such as Tomcat or Jetty)</title>
- <para>Web Beans can be used in Tomcat 6.0.</para>
+ <para>Web Beans can be used in any Servlet container such as Tomcat 6.0 or Jetty 6.1.</para>
<note>
<para>
Web Beans doesn't support deploying session beans, injection using
<literal>@EJB</literal>, or
<literal>@PersistenceContext</literal> or using transactional events
- on Tomcat.
+ in Servlet containers.
</para>
</note>
<para>
- Web Beans should be used as a web application library in Tomcat. You
- should place <literal>webbeans-tomcat.jar</literal> in
- <literal>WEB-INF/lib</literal>. <literal>webbeans-tomcat.jar</literal>
+ Web Beans should be used as a web application library in a servlet
+ container. You should place <literal>webbeans-servlet.jar</literal> in
+ <literal>WEB-INF/lib</literal>. <literal>webbeans-serv;et.jar</literal>
is an "uber-jar" provided for your convenience. Instead, you could use
its component jars:
</para>
@@ -100,7 +100,7 @@
</listitem>
<listitem>
<para>
- <literal>webbeans-tomcat-int.jar</literal>
+ <literal>webbeans-servlet-int.jar</literal>
</para>
</listitem>
<listitem>
@@ -116,7 +116,7 @@
</itemizedlist>
<para>
- You also need to explicitly specify the Tomcat servlet listener (used to
+ You also need to explicitly specify the servlet listener (used to
boot Web Beans, and control its interaction with requests) in
<literal>web.xml</literal>:
</para>
@@ -125,24 +125,27 @@
<listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-class>
</listener>]]></programlisting>
- <para>
- Tomcat has a read-only JNDI, so Web Beans can't automatically bind the
- Manager. To bind the Manager into JNDI, you should add the following to
- your <literal>META-INF/context.xml</literal>:
- </para>
+ <section>
+ <title>Tomcat</title>
+
+ <para>
+ Tomcat has a read-only JNDI, so Web Beans can't automatically bind
+ the Manager. To bind the Manager into JNDI, you should add the
+ following to your <literal>META-INF/context.xml</literal>:
+ </para>
- <programlisting><![CDATA[<Resource name="app/Manager"
+ <programlisting><![CDATA[<Resource name="app/Manager"
auth="Container"
type="javax.inject.manager.Manager"
factory="org.jboss.webbeans.resources.ManagerObjectFactory"/>
]]></programlisting>
- <para>
- and make it available to your deployment by adding this to
- <literal>web.xml</literal>:
- </para>
+ <para>
+ and make it available to your deployment by adding this to
+ <literal>web.xml</literal>:
+ </para>
- <programlisting><![CDATA[<resource-env-ref>
+ <programlisting><![CDATA[<resource-env-ref>
<resource-env-ref-name>
app/Manager
</resource-env-ref-name>
@@ -151,20 +154,22 @@
</resource-env-ref-type>
</resource-env-ref>]]></programlisting>
- <para>
- Tomcat only allows you to bind entries to
- <literal>java:comp/env</literal>, so the Manager will be available at
- <literal>java:comp/env/app/Manager</literal>
- </para>
+ <para>
+ Tomcat only allows you to bind entries to
+ <literal>java:comp/env</literal>, so the Manager will be available
+ at <literal>java:comp/env/app/Manager</literal>
+ </para>
- <para>
- Web Beans also supports Servlet injection in Tomcat. To enable this,
- place the <literal>webbeans-tomcat-support.jar</literal> in
- <literal>$TOMCAT_HOME/lib</literal>, and add the following to your
- <literal>META-INF/context.xml</literal>:
- </para>
+ <para>
+ Web Beans also supports Servlet injection in Tomcat. To enable this,
+ place the <literal>webbeans-tomcat-support.jar</literal> in
+ <literal>$TOMCAT_HOME/lib</literal>, and add the following to your
+ <literal>META-INF/context.xml</literal>:
+ </para>
- <programlisting><![CDATA[<Listener className="org.jboss.webbeans.environment.tomcat.WebBeansLifecycleListener" />]]></programlisting>
+ <programlisting><![CDATA[<Listener className="org.jboss.webbeans.environment.tomcat.WebBeansLifecycleListener" />]]></programlisting>
+
+ </section>
</section>
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2452 - in extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet: discovery and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: cpopetz
Date: 2009-04-16 17:06:20 -0400 (Thu, 16 Apr 2009)
New Revision: 2452
Added:
extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscovery.java
extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/ServletResourceServices.java
Removed:
extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/TomcatWebBeanDiscovery.java
extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/TomcatResourceServices.java
Modified:
extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/Listener.java
extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/AbstractScanner.java
extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/URLScanner.java
Log:
WBX-29 s/tomcat/servlet/
Modified: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/Listener.java
===================================================================
--- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/Listener.java 2009-04-16 20:41:40 UTC (rev 2451)
+++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/Listener.java 2009-04-16 21:06:20 UTC (rev 2452)
@@ -23,8 +23,8 @@
import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
import org.jboss.webbeans.context.api.BeanStore;
import org.jboss.webbeans.context.api.helpers.ConcurrentHashMapBeanStore;
-import org.jboss.webbeans.environment.servlet.discovery.TomcatWebBeanDiscovery;
-import org.jboss.webbeans.environment.servlet.resources.TomcatResourceServices;
+import org.jboss.webbeans.environment.servlet.discovery.ServletWebBeanDiscovery;
+import org.jboss.webbeans.environment.servlet.resources.ServletResourceServices;
import org.jboss.webbeans.environment.servlet.util.Reflections;
import org.jboss.webbeans.environment.tomcat.WebBeansAnnotationProcessor;
import org.jboss.webbeans.log.Log;
@@ -83,10 +83,10 @@
BeanStore applicationBeanStore = new ConcurrentHashMapBeanStore();
sce.getServletContext().setAttribute(APPLICATION_BEAN_STORE_ATTRIBUTE_NAME, applicationBeanStore);
bootstrap.setEnvironment(Environments.SERVLET);
- bootstrap.getServices().add(WebBeanDiscovery.class, new TomcatWebBeanDiscovery(sce.getServletContext()) {});
+ bootstrap.getServices().add(WebBeanDiscovery.class, new ServletWebBeanDiscovery(sce.getServletContext()) {});
try
{
- bootstrap.getServices().add(ResourceServices.class, new TomcatResourceServices() {});
+ bootstrap.getServices().add(ResourceServices.class, new ServletResourceServices() {});
}
catch (NoClassDefFoundError e)
{
Modified: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/AbstractScanner.java
===================================================================
--- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/AbstractScanner.java 2009-04-16 20:41:40 UTC (rev 2451)
+++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/AbstractScanner.java 2009-04-16 21:06:20 UTC (rev 2452)
@@ -34,9 +34,9 @@
private static final Log log = Logging.getLog(Scanner.class);
private final ClassLoader classLoader;
- private final TomcatWebBeanDiscovery webBeanDiscovery;
+ private final ServletWebBeanDiscovery webBeanDiscovery;
- public AbstractScanner(ClassLoader classLoader, TomcatWebBeanDiscovery webBeanDiscovery)
+ public AbstractScanner(ClassLoader classLoader, ServletWebBeanDiscovery webBeanDiscovery)
{
this.classLoader = classLoader;
this.webBeanDiscovery = webBeanDiscovery;
Copied: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscovery.java (from rev 2450, extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/TomcatWebBeanDiscovery.java)
===================================================================
--- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscovery.java (rev 0)
+++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscovery.java 2009-04-16 21:06:20 UTC (rev 2452)
@@ -0,0 +1,99 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.webbeans.environment.servlet.discovery;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.servlet.ServletContext;
+
+import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
+import org.jboss.webbeans.environment.servlet.util.Reflections;
+import org.jboss.webbeans.environment.servlet.util.Servlets;
+
+/**
+ * The means by which Web Beans are discovered on the classpath. This will only
+ * discover simple web beans - there is no EJB/Servlet/JPA integration.
+ *
+ * @author Peter Royle
+ * @author Pete Muir
+ * @author Ales Justin
+ */
+public abstract class ServletWebBeanDiscovery implements WebBeanDiscovery
+{
+
+ private final Set<Class<?>> wbClasses;
+ private final Set<URL> wbUrls;
+ private final ServletContext servletContext;
+
+ public ServletWebBeanDiscovery(ServletContext servletContext)
+ {
+ this.wbClasses = new HashSet<Class<?>>();
+ this.wbUrls = new HashSet<URL>();
+ this.servletContext = servletContext;
+ scan();
+ }
+
+ public Iterable<Class<?>> discoverWebBeanClasses()
+ {
+ return Collections.unmodifiableSet(wbClasses);
+ }
+
+ public Iterable<URL> discoverWebBeansXml()
+ {
+ return Collections.unmodifiableSet(wbUrls);
+ }
+
+ public Set<Class<?>> getWbClasses()
+ {
+ return wbClasses;
+ }
+
+ public Set<URL> getWbUrls()
+ {
+ return wbUrls;
+ }
+
+ private void scan()
+ {
+ Scanner scanner = new URLScanner(Reflections.getClassLoader(), this);
+ scanner.scanResources(new String[] { "beans.xml" });
+ try
+ {
+ URL beans = servletContext.getResource("/WEB-INF/beans.xml");
+ if (beans != null)
+ {
+ File webInfClasses = Servlets.getRealFile(servletContext, "/WEB-INF/classes");
+ if (webInfClasses != null)
+ {
+ File[] files = { webInfClasses };
+ scanner.scanDirectories(files);
+ wbUrls.add(beans);
+ }
+ }
+ }
+ catch (MalformedURLException e)
+ {
+ throw new IllegalStateException("Error loading resources from servlet context ", e);
+ }
+ }
+
+}
Deleted: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/TomcatWebBeanDiscovery.java
===================================================================
--- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/TomcatWebBeanDiscovery.java 2009-04-16 20:41:40 UTC (rev 2451)
+++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/TomcatWebBeanDiscovery.java 2009-04-16 21:06:20 UTC (rev 2452)
@@ -1,99 +0,0 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.webbeans.environment.servlet.discovery;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.servlet.ServletContext;
-
-import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
-import org.jboss.webbeans.environment.servlet.util.Reflections;
-import org.jboss.webbeans.environment.servlet.util.Servlets;
-
-/**
- * The means by which Web Beans are discovered on the classpath. This will only
- * discover simple web beans - there is no EJB/Servlet/JPA integration.
- *
- * @author Peter Royle
- * @author Pete Muir
- * @author Ales Justin
- */
-public abstract class TomcatWebBeanDiscovery implements WebBeanDiscovery
-{
-
- private final Set<Class<?>> wbClasses;
- private final Set<URL> wbUrls;
- private final ServletContext servletContext;
-
- public TomcatWebBeanDiscovery(ServletContext servletContext)
- {
- this.wbClasses = new HashSet<Class<?>>();
- this.wbUrls = new HashSet<URL>();
- this.servletContext = servletContext;
- scan();
- }
-
- public Iterable<Class<?>> discoverWebBeanClasses()
- {
- return Collections.unmodifiableSet(wbClasses);
- }
-
- public Iterable<URL> discoverWebBeansXml()
- {
- return Collections.unmodifiableSet(wbUrls);
- }
-
- public Set<Class<?>> getWbClasses()
- {
- return wbClasses;
- }
-
- public Set<URL> getWbUrls()
- {
- return wbUrls;
- }
-
- private void scan()
- {
- Scanner scanner = new URLScanner(Reflections.getClassLoader(), this);
- scanner.scanResources(new String[] { "beans.xml" });
- try
- {
- URL beans = servletContext.getResource("/WEB-INF/beans.xml");
- if (beans != null)
- {
- File webInfClasses = Servlets.getRealFile(servletContext, "/WEB-INF/classes");
- if (webInfClasses != null)
- {
- File[] files = { webInfClasses };
- scanner.scanDirectories(files);
- wbUrls.add(beans);
- }
- }
- }
- catch (MalformedURLException e)
- {
- throw new IllegalStateException("Error loading resources from servlet context ", e);
- }
- }
-
-}
Modified: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/URLScanner.java
===================================================================
--- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/URLScanner.java 2009-04-16 20:41:40 UTC (rev 2451)
+++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/URLScanner.java 2009-04-16 21:06:20 UTC (rev 2452)
@@ -45,7 +45,7 @@
{
private static final Log log = Logging.getLog(URLScanner.class);
- public URLScanner(ClassLoader classLoader, TomcatWebBeanDiscovery webBeanDiscovery)
+ public URLScanner(ClassLoader classLoader, ServletWebBeanDiscovery webBeanDiscovery)
{
super(classLoader, webBeanDiscovery);
}
Copied: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/ServletResourceServices.java (from rev 2450, extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/TomcatResourceServices.java)
===================================================================
--- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/ServletResourceServices.java (rev 0)
+++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/ServletResourceServices.java 2009-04-16 21:06:20 UTC (rev 2452)
@@ -0,0 +1,33 @@
+package org.jboss.webbeans.environment.servlet.resources;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.webbeans.resources.spi.ResourceServices;
+import org.jboss.webbeans.resources.spi.helpers.AbstractResourceServices;
+
+public abstract class ServletResourceServices extends AbstractResourceServices implements ResourceServices
+{
+
+ private Context context;
+
+ public ServletResourceServices()
+ {
+ try
+ {
+ context = new InitialContext();
+ }
+ catch (NamingException e)
+ {
+ throw new IllegalStateException("Error creating JNDI context", e);
+ }
+ }
+
+ @Override
+ protected Context getContext()
+ {
+ return context;
+ }
+
+}
Deleted: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/TomcatResourceServices.java
===================================================================
--- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/TomcatResourceServices.java 2009-04-16 20:41:40 UTC (rev 2451)
+++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/TomcatResourceServices.java 2009-04-16 21:06:20 UTC (rev 2452)
@@ -1,33 +0,0 @@
-package org.jboss.webbeans.environment.servlet.resources;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.webbeans.resources.spi.ResourceServices;
-import org.jboss.webbeans.resources.spi.helpers.AbstractResourceServices;
-
-public abstract class TomcatResourceServices extends AbstractResourceServices implements ResourceServices
-{
-
- private Context context;
-
- public TomcatResourceServices()
- {
- try
- {
- context = new InitialContext();
- }
- catch (NamingException e)
- {
- throw new IllegalStateException("Error creating JNDI context", e);
- }
- }
-
- @Override
- protected Context getContext()
- {
- return context;
- }
-
-}
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2451 - in examples/trunk: wicket/conversations and 3 other directories.
by webbeans-commits＠lists.jboss.org
Author: cpopetz
Date: 2009-04-16 16:41:40 -0400 (Thu, 16 Apr 2009)
New Revision: 2451
Added:
examples/trunk/wicket/gae/war/WEB-INF/lib/webbeans-servlet-1.0.0-SNAPSHOT.jar
Removed:
examples/trunk/wicket/gae/war/WEB-INF/lib/webbeans-tomcat-1.0.0-SNAPSHOT.jar
Modified:
examples/trunk/tomcat/pom.xml
examples/trunk/wicket/conversations/pom.xml
examples/trunk/wicket/gae/.classpath
examples/trunk/wicket/numberguess/pom.xml
Log:
WBX-29 s/tomcat/servlet/
Modified: examples/trunk/tomcat/pom.xml
===================================================================
--- examples/trunk/tomcat/pom.xml 2009-04-16 20:38:26 UTC (rev 2450)
+++ examples/trunk/tomcat/pom.xml 2009-04-16 20:41:40 UTC (rev 2451)
@@ -55,8 +55,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.webbeans.tomcat</groupId>
- <artifactId>webbeans-tomcat</artifactId>
+ <groupId>org.jboss.webbeans.servlet</groupId>
+ <artifactId>webbeans-servlet</artifactId>
<scope>runtime</scope>
</dependency>
Modified: examples/trunk/wicket/conversations/pom.xml
===================================================================
--- examples/trunk/wicket/conversations/pom.xml 2009-04-16 20:38:26 UTC (rev 2450)
+++ examples/trunk/wicket/conversations/pom.xml 2009-04-16 20:41:40 UTC (rev 2451)
@@ -34,8 +34,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.webbeans.tomcat</groupId>
- <artifactId>webbeans-tomcat</artifactId>
+ <groupId>org.jboss.webbeans.servlet</groupId>
+ <artifactId>webbeans-servlet</artifactId>
</dependency>
<dependency>
Modified: examples/trunk/wicket/gae/.classpath
===================================================================
--- examples/trunk/wicket/gae/.classpath 2009-04-16 20:38:26 UTC (rev 2450)
+++ examples/trunk/wicket/gae/.classpath 2009-04-16 20:41:40 UTC (rev 2451)
@@ -4,7 +4,7 @@
<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/webbeans-servlet-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"/>
Added: examples/trunk/wicket/gae/war/WEB-INF/lib/webbeans-servlet-1.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: examples/trunk/wicket/gae/war/WEB-INF/lib/webbeans-servlet-1.0.0-SNAPSHOT.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Deleted: examples/trunk/wicket/gae/war/WEB-INF/lib/webbeans-tomcat-1.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: examples/trunk/wicket/numberguess/pom.xml
===================================================================
--- examples/trunk/wicket/numberguess/pom.xml 2009-04-16 20:38:26 UTC (rev 2450)
+++ examples/trunk/wicket/numberguess/pom.xml 2009-04-16 20:41:40 UTC (rev 2451)
@@ -34,8 +34,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.webbeans.tomcat</groupId>
- <artifactId>webbeans-tomcat</artifactId>
+ <groupId>org.jboss.webbeans.servlet</groupId>
+ <artifactId>webbeans-servlet</artifactId>
<scope>runtime</scope>
</dependency>
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2450 - in extensions/trunk: servlet and 4 other directories.
by webbeans-commits＠lists.jboss.org
Author: cpopetz
Date: 2009-04-16 16:38:26 -0400 (Thu, 16 Apr 2009)
New Revision: 2450
Added:
extensions/trunk/servlet/
Removed:
extensions/trunk/tomcat/
Modified:
extensions/trunk/servlet/build/pom.xml
extensions/trunk/servlet/int/pom.xml
extensions/trunk/servlet/pom.xml
extensions/trunk/servlet/support/pom.xml
extensions/trunk/servlet/tests/pom.xml
Log:
WBX-29 s/tomcat/servlet/
Copied: extensions/trunk/servlet (from rev 2445, extensions/trunk/tomcat)
Modified: extensions/trunk/servlet/build/pom.xml
===================================================================
--- extensions/trunk/tomcat/build/pom.xml 2009-04-16 19:12:11 UTC (rev 2445)
+++ extensions/trunk/servlet/build/pom.xml 2009-04-16 20:38:26 UTC (rev 2450)
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>webbeans-tomcat-parent</artifactId>
- <groupId>org.jboss.webbeans.tomcat</groupId>
+ <artifactId>webbeans-servlet-parent</artifactId>
+ <groupId>org.jboss.webbeans.servlet</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans.tomcat</groupId>
- <artifactId>webbeans-tomcat</artifactId>
+ <groupId>org.jboss.webbeans.servlet</groupId>
+ <artifactId>webbeans-servlet</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Web Beans Tomcat module</name>
+ <name>Web Beans Servlet module</name>
<url>http://www.seamframework.org/WebBeans</url>
<dependencies>
<dependency>
- <groupId>org.jboss.webbeans.tomcat</groupId>
- <artifactId>webbeans-tomcat-int</artifactId>
+ <groupId>org.jboss.webbeans.servlet</groupId>
+ <artifactId>webbeans-servlet-int</artifactId>
<optional>true</optional>
</dependency>
Modified: extensions/trunk/servlet/int/pom.xml
===================================================================
--- extensions/trunk/tomcat/int/pom.xml 2009-04-16 19:12:11 UTC (rev 2445)
+++ extensions/trunk/servlet/int/pom.xml 2009-04-16 20:38:26 UTC (rev 2450)
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>webbeans-tomcat-parent</artifactId>
- <groupId>org.jboss.webbeans.tomcat</groupId>
+ <artifactId>webbeans-servlet-parent</artifactId>
+ <groupId>org.jboss.webbeans.servlet</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans.tomcat</groupId>
- <artifactId>webbeans-tomcat-int</artifactId>
+ <groupId>org.jboss.webbeans.servlet</groupId>
+ <artifactId>webbeans-servlet-int</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Web Beans Tomcat Integration</name>
+ <name>Web Beans Servlet Integration</name>
<url>http://www.seamframework.org/WebBeans</url>
<dependencies>
Modified: extensions/trunk/servlet/pom.xml
===================================================================
--- extensions/trunk/tomcat/pom.xml 2009-04-16 19:12:11 UTC (rev 2445)
+++ extensions/trunk/servlet/pom.xml 2009-04-16 20:38:26 UTC (rev 2450)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans.tomcat</groupId>
- <artifactId>webbeans-tomcat-parent</artifactId>
+ <groupId>org.jboss.webbeans.servlet</groupId>
+ <artifactId>webbeans-servlet-parent</artifactId>
<packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
@@ -11,7 +11,7 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
- <name>Web Beans Tomcat aggregator</name>
+ <name>Web Beans Servlet aggregator</name>
<url>http://www.seamframework.org/WebBeans</url>
<modules>
@@ -22,7 +22,7 @@
</modules>
<description>
- Support for Web Beans on Tomcat
+ Support for Web Beans in Servlet Containers
</description>
<developers>
Modified: extensions/trunk/servlet/support/pom.xml
===================================================================
--- extensions/trunk/tomcat/support/pom.xml 2009-04-16 19:12:11 UTC (rev 2445)
+++ extensions/trunk/servlet/support/pom.xml 2009-04-16 20:38:26 UTC (rev 2450)
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>webbeans-tomcat-parent</artifactId>
- <groupId>org.jboss.webbeans.tomcat</groupId>
+ <artifactId>webbeans-servlet-parent</artifactId>
+ <groupId>org.jboss.webbeans.servlet</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans.tomcat</groupId>
- <artifactId>webbeans-tomcat-support</artifactId>
+ <groupId>org.jboss.webbeans.servlet</groupId>
+ <artifactId>webbeans-servlet-support</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Web Beans Tomcat Integration</name>
+ <name>Web Beans Servlet Integration</name>
<url>http://www.seamframework.org/WebBeans</url>
<dependencies>
Modified: extensions/trunk/servlet/tests/pom.xml
===================================================================
--- extensions/trunk/tomcat/tests/pom.xml 2009-04-16 19:12:11 UTC (rev 2445)
+++ extensions/trunk/servlet/tests/pom.xml 2009-04-16 20:38:26 UTC (rev 2450)
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>webbeans-tomcat-parent</artifactId>
- <groupId>org.jboss.webbeans.tomcat</groupId>
+ <artifactId>webbeans-servlet-parent</artifactId>
+ <groupId>org.jboss.webbeans.servlet</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans.tomcat</groupId>
- <artifactId>webbeans-tomcat-test</artifactId>
+ <groupId>org.jboss.webbeans.servlet</groupId>
+ <artifactId>webbeans-servlet-test</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Web Beans Tomcat Integration Tests</name>
+ <name>Web Beans Servlet Integration Tests</name>
<url>http://www.seamframework.org/WebBeans</url>
<dependencies>
@@ -161,8 +161,8 @@
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>org.jboss.webbeans.tomcat</groupId>
- <artifactId>webbeans-tomcat</artifactId>
+ <groupId>org.jboss.webbeans.servlet</groupId>
+ <artifactId>webbeans-servlet</artifactId>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2449 - ri/trunk/version-matrix.
by webbeans-commits＠lists.jboss.org
Author: cpopetz
Date: 2009-04-16 16:38:07 -0400 (Thu, 16 Apr 2009)
New Revision: 2449
Modified:
ri/trunk/version-matrix/pom.xml
Log:
WBX-29 s/tomcat/servlet/
Modified: ri/trunk/version-matrix/pom.xml
===================================================================
--- ri/trunk/version-matrix/pom.xml 2009-04-16 20:35:51 UTC (rev 2448)
+++ ri/trunk/version-matrix/pom.xml 2009-04-16 20:38:07 UTC (rev 2449)
@@ -49,7 +49,7 @@
<properties>
<jsr299.tck.version>1.0.0-SNAPSHOT</jsr299.tck.version>
<webbeans.version>1.0.0-SNAPSHOT</webbeans.version>
- <webbeans.tomcat.version>1.0.0-SNAPSHOT</webbeans.tomcat.version>
+ <webbeans.servlet.version>1.0.0-SNAPSHOT</webbeans.servlet.version>
<webbeans.se.version>1.0.0-SNAPSHOT</webbeans.se.version>
</properties>
@@ -270,15 +270,15 @@
</dependency>
<dependency>
- <groupId>org.jboss.webbeans.tomcat</groupId>
- <artifactId>webbeans-tomcat-int</artifactId>
- <version>${webbeans.tomcat.version}</version>
+ <groupId>org.jboss.webbeans.servlet</groupId>
+ <artifactId>webbeans-servlet-int</artifactId>
+ <version>${webbeans.servlet.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans.tomcat</groupId>
- <artifactId>webbeans-tomcat</artifactId>
- <version>${webbeans.tomcat.version}</version>
+ <groupId>org.jboss.webbeans.servlet</groupId>
+ <artifactId>webbeans-servlet</artifactId>
+ <version>${webbeans.servlet.version}</version>
</dependency>
<dependency>
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2448 - in tck/trunk/impl/src/main: resources/org/jboss/jsr299/tck/tests/xml/resource/ejb and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-04-16 16:35:51 -0400 (Thu, 16 Apr 2009)
New Revision: 2448
Modified:
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/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:
Changed naming conventions for EJB for portability of the test
Modified: 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 2009-04-16 19:48:25 UTC (rev 2447)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java 2009-04-16 20:35:51 UTC (rev 2448)
@@ -26,6 +26,7 @@
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.ear.EjbJarXml;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
@@ -39,10 +40,10 @@
@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")
+ @Resource(source="web.xml", destination="WEB-INF/web.xml")
})
@BeansXml("beans.xml")
+@EjbJarXml("ejb-jar.xml")
public class InjectionOfEjbTest extends AbstractJSR299Test
{
@Test(groups = { "xml", "broken" })
Modified: 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 2009-04-16 19:48:25 UTC (rev 2447)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjb.java 2009-04-16 20:35:51 UTC (rev 2448)
@@ -2,7 +2,7 @@
import javax.ejb.Stateless;
-@Stateless(name="MyRemoteEjb")
+@Stateless(name="MyRemoteEjb", mappedName="ejb/MyRemoteEjb")
public class RemoteEjb implements RemoteEjbInterface
{
Modified: 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 2009-04-16 19:48:25 UTC (rev 2447)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/beans.xml 2009-04-16 20:35:51 UTC (rev 2448)
@@ -6,7 +6,7 @@
</Deploy>
<test:SimpleBean>
<EJB>
- <name>xml-resource-ejb/MyRemoteEjb/remote</name>
+ <name>ejb/MyRemoteEjb</name>
</EJB>
</test:SimpleBean>
</Beans>
Modified: 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 2009-04-16 19:48:25 UTC (rev 2447)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/ejb-jar.xml 2009-04-16 20:35:51 UTC (rev 2448)
@@ -9,9 +9,10 @@
<session>
<ejb-name>MyRemoteEjb</ejb-name>
<ejb-ref>
- <ejb-ref-name>xml-resource-ejb/MyRemoteEjb/remote</ejb-ref-name>
+ <ejb-ref-name>ejb/MyRemoteEjb</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
- <remote>org.jboss.seam.example.booking.Authenticator</remote>
+ <remote>org.jboss.jsr299.tck.tests.xml.resource.ejb.RemoteEjbInterface</remote>
+ <mapped-name>ejb/MyRemoteEjb</mapped-name>
</ejb-ref>
</session>
</enterprise-beans>
Modified: 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 2009-04-16 19:48:25 UTC (rev 2447)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/web.xml 2009-04-16 20:35:51 UTC (rev 2448)
@@ -5,9 +5,10 @@
<display-name>Session Context Tests</display-name>
<ejb-ref>
- <ejb-ref-name>xml-resource-ejb/MyRemoteEjb/remote</ejb-ref-name>
+ <ejb-ref-name>ejb/MyRemoteEjb</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
<remote>org.jboss.jsr299.tck.tests.xml.resource.ejb.RemoteEjbInterface</remote>
+ <mapped-name>ejb/MyRemoteEjb</mapped-name>
</ejb-ref>
<session-config>
16 years, 12 months