[webbeans-commits] Webbeans SVN: r2638 - ri/trunk/impl/src/main/java/org/jboss/webbeans.
by webbeans-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-04-30 15:34:00 -0400 (Thu, 30 Apr 2009)
New Revision: 2638
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java
Log:
fix grammer error
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-04-30 19:32:28 UTC (rev 2637)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-04-30 19:34:00 UTC (rev 2638)
@@ -125,7 +125,7 @@
}
if (Beans.isPassivatingBean(bean, manager) && !resolvedBean.isSerializable() && resolvedBean.getScopeType().equals(Dependent.class))
{
- throw new UnserializableDependencyException("The bean " + bean + " declares a passivating scopes but has non-serializable dependency: " + resolvedBean);
+ throw new UnserializableDependencyException("The bean " + bean + " declares a passivating scope but has non-serializable dependency: " + resolvedBean);
}
}
if (bean instanceof RIBean && !(bean instanceof NewSimpleBean) && !(bean instanceof NewEnterpriseBean))
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2637 - in extensions/trunk/logger/src/main: resources and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-04-30 15:32:28 -0400 (Thu, 30 Apr 2009)
New Revision: 2637
Added:
extensions/trunk/logger/src/main/resources/
extensions/trunk/logger/src/main/resources/META-INF/
extensions/trunk/logger/src/main/resources/META-INF/beans.xml
Log:
add beans.xml to activate @Logger and LogProducer beans
Added: extensions/trunk/logger/src/main/resources/META-INF/beans.xml
===================================================================
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2636 - in ri/trunk: impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: vitold
Date: 2009-04-30 09:51:45 -0400 (Thu, 30 Apr 2009)
New Revision: 2636
Added:
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/JmsResourceBeanChildrenChecker.java
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java
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/ResourceBeanChildrenChecker.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/JmsResourceElementRegistrator.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/ResourceElementRegistrator.java
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml
Log:
make 3.7
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java 2009-04-30 08:45:48 UTC (rev 2635)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java 2009-04-30 13:51:45 UTC (rev 2636)
@@ -42,6 +42,7 @@
import org.jboss.webbeans.introspector.AnnotatedClass;
import org.jboss.webbeans.log.Log;
import org.jboss.webbeans.log.Logging;
+import org.jboss.webbeans.xml.checker.beanchildren.ext.JmsResourceBeanChildrenChecker;
import org.jboss.webbeans.xml.checker.beanchildren.ext.NotSimpleBeanChildrenChecker;
import org.jboss.webbeans.xml.checker.beanchildren.ext.ResourceBeanChildrenChecker;
import org.jboss.webbeans.xml.checker.beanchildren.ext.SimpleBeanChildrenChecker;
@@ -332,7 +333,7 @@
private void checkBeanElement(Element beanElement, AnnotatedClass<?> beanClass)
{
- beanElementRegistrators.add(new JmsResourceElementRegistrator(new NotSimpleBeanChildrenChecker(environment, packagesMap)));
+ beanElementRegistrators.add(new JmsResourceElementRegistrator(new JmsResourceBeanChildrenChecker(environment, packagesMap)));
beanElementRegistrators.add(new ResourceElementRegistrator(new ResourceBeanChildrenChecker(environment, packagesMap)));
beanElementRegistrators.add(new SessionBeanElementRegistrator(new NotSimpleBeanChildrenChecker(environment, packagesMap), environment.getEjbDescriptors()));
beanElementRegistrators.add(new SimpleBeanElementRegistrator(new SimpleBeanChildrenChecker(environment, packagesMap), environment.getEjbDescriptors()));
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-30 08:45:48 UTC (rev 2635)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java 2009-04-30 13:51:45 UTC (rev 2636)
@@ -48,7 +48,6 @@
import org.jboss.webbeans.xml.ParseXmlHelper;
import org.jboss.webbeans.xml.XmlConstants;
import org.jboss.webbeans.xml.XmlEnvironment;
-import org.jboss.webbeans.xml.checker.beanchildren.BeanChildrenChecker;
import org.jboss.webbeans.xml.checker.beanchildren.impl.BeanChildrenCheckerImpl;
public abstract class AbstractBeanChildrenChecker extends BeanChildrenCheckerImpl
Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/JmsResourceBeanChildrenChecker.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/JmsResourceBeanChildrenChecker.java (rev 0)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/JmsResourceBeanChildrenChecker.java 2009-04-30 13:51:45 UTC (rev 2636)
@@ -0,0 +1,33 @@
+package org.jboss.webbeans.xml.checker.beanchildren.ext;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.dom4j.Element;
+import org.jboss.webbeans.introspector.AnnotatedClass;
+import org.jboss.webbeans.xml.ParseXmlHelper;
+import org.jboss.webbeans.xml.XmlConstants;
+import org.jboss.webbeans.xml.XmlEnvironment;
+
+public class JmsResourceBeanChildrenChecker extends ResourceBeanChildrenChecker
+{
+ private static final String RESOURCE_TYPE = "JMS";
+
+ public JmsResourceBeanChildrenChecker(XmlEnvironment environment, Map<String, Set<String>> packagesMap)
+ {
+ super(environment, packagesMap);
+ }
+
+ protected void checkRIBean(Element beanElement, AnnotatedClass<?> beanClass)
+ {
+ List<Element> resourceElements = ParseXmlHelper.findElementsInEeNamespace(beanElement, XmlConstants.RESOURCE);
+ if (resourceElements.size() > 0)
+ checkResourceElements(resourceElements);
+ }
+
+ protected String getResourceType()
+ {
+ return RESOURCE_TYPE;
+ }
+}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/ResourceBeanChildrenChecker.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/ResourceBeanChildrenChecker.java 2009-04-30 08:45:48 UTC (rev 2635)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/ResourceBeanChildrenChecker.java 2009-04-30 13:51:45 UTC (rev 2636)
@@ -30,6 +30,8 @@
public class ResourceBeanChildrenChecker extends NotSimpleBeanChildrenChecker
{
+ private static final String RESOURCE_TYPE = "Java EE";
+
public ResourceBeanChildrenChecker(XmlEnvironment environment, Map<String, Set<String>> packagesMap)
{
super(environment, packagesMap);
@@ -73,7 +75,7 @@
}
}
- private void checkResourceElements(List<Element> resourceElements)
+ protected void checkResourceElements(List<Element> resourceElements)
{
Element resourceElement = resourceElements.get(0);
@@ -84,13 +86,18 @@
List<Element> mappedNameElements = ParseXmlHelper.findElementsInEeNamespace(resourceElement, XmlConstants.MAPPED_NAME);
if (nameElements.size() + mappedNameElements.size() != 1)
- throw new DefinitionException("For a Java EE resource '" + resourceElement.getParent().getName() + "', JNDI name " +
+ throw new DefinitionException("For a " + getResourceType() + " resource '" + resourceElement.getParent().getName() + "', JNDI name " +
"or mapped name must be specified using the <name> or <mappedName> child elements of the <Resource> element");
if (nameElements.size() == 1)
checkJndiNameElementValue(nameElements.get(0));
}
+ protected String getResourceType()
+ {
+ return RESOURCE_TYPE;
+ }
+
private void checkPersContextElements(List<Element> persContextElements)
{
Element persContextElement = persContextElements.get(0);
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/JmsResourceElementRegistrator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/JmsResourceElementRegistrator.java 2009-04-30 08:45:48 UTC (rev 2635)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/JmsResourceElementRegistrator.java 2009-04-30 13:51:45 UTC (rev 2636)
@@ -16,13 +16,24 @@
*/
package org.jboss.webbeans.xml.registrator.bean.ext;
+import java.lang.annotation.Annotation;
+import java.util.List;
+import java.util.Set;
+
+import javax.inject.DefinitionException;
+
import org.dom4j.Element;
+import org.jboss.webbeans.bean.RIBean;
+import org.jboss.webbeans.bean.ee.AbstractJavaEEResourceBean;
+import org.jboss.webbeans.bean.ee.jms.JmsQueueBean;
+import org.jboss.webbeans.bean.ee.jms.JmsTopicBean;
import org.jboss.webbeans.introspector.AnnotatedClass;
+import org.jboss.webbeans.messaging.spi.JmsServices;
import org.jboss.webbeans.xml.ParseXmlHelper;
import org.jboss.webbeans.xml.XmlConstants;
import org.jboss.webbeans.xml.checker.beanchildren.BeanChildrenChecker;
-public class JmsResourceElementRegistrator extends NotSimpleBeanElementRegistrator
+public class JmsResourceElementRegistrator extends ResourceElementRegistrator
{
public JmsResourceElementRegistrator(BeanChildrenChecker childrenChecker)
{
@@ -37,4 +48,34 @@
return true;
return false;
}
+
+ protected void checkElementDeclaration(Element beanElement, AnnotatedClass<?> beanClass)
+ {
+ List<Element> resourceElements = ParseXmlHelper.findElementsInEeNamespace(beanElement, XmlConstants.RESOURCE);
+ if (resourceElements.size() == 0)
+ throw new DefinitionException("Each JMS resource declaration must contain a child <Resource> element, " +
+ "but there is noone in <" + beanElement.getName() + ">");
+ }
+
+ protected void register(Element beanElement, AnnotatedClass<?> beanClass)
+ {
+ Element resourceElement = ParseXmlHelper.findElementsInEeNamespace(beanElement, XmlConstants.RESOURCE).get(0);
+
+ Class<? extends Annotation> deploymentType = obtainDeploymentType(beanElement);
+ Set<Annotation> bindings = obtainBindings(beanElement);
+ String jndiName = obtainElementValue(resourceElement, XmlConstants.JNDI_NAME);
+ String mappedName = obtainElementValue(resourceElement, XmlConstants.MAPPED_NAME);
+
+ RIBean<?> bean = null;
+
+ if (XmlConstants.TOPIC.equalsIgnoreCase(beanElement.getName()))
+ bean = new JmsTopicBean(environment.getManager(), deploymentType, bindings, jndiName, mappedName);
+ else
+ bean = new JmsQueueBean(environment.getManager(), deploymentType, bindings, jndiName, mappedName);
+
+ if (environment.getServices().contains(JmsServices.class))
+ {
+ environment.getResourceBeans().add((AbstractJavaEEResourceBean<?>) bean);
+ }
+ }
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/ResourceElementRegistrator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/ResourceElementRegistrator.java 2009-04-30 08:45:48 UTC (rev 2635)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/ResourceElementRegistrator.java 2009-04-30 13:51:45 UTC (rev 2636)
@@ -195,7 +195,7 @@
}
}
- private Class<? extends Annotation> obtainDeploymentType(Element beanElement)
+ protected Class<? extends Annotation> obtainDeploymentType(Element beanElement)
{
Iterator<?> elIterator = beanElement.elementIterator();
while (elIterator.hasNext())
@@ -209,7 +209,7 @@
return null;
}
- private Set<Annotation> obtainBindings(Element beanElement)
+ protected Set<Annotation> obtainBindings(Element beanElement)
{
Set<Annotation> result = new HashSet<Annotation>();
@@ -238,7 +238,7 @@
return result;
}
- private String obtainElementValue(Element elementParent, String elementName)
+ protected String obtainElementValue(Element elementParent, String elementName)
{
List<Element> elements = ParseXmlHelper.findElementsInEeNamespace(elementParent, elementName);
if (elements.size() > 0)
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-30 08:45:48 UTC (rev 2635)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml 2009-04-30 13:51:45 UTC (rev 2636)
@@ -2,7 +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: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">
<Deploy>
<Standard />
<Production />
@@ -21,7 +21,7 @@
<myapp:TestScopeType />
<myapp:TestDeploymentType />
<myapp:AnotherTestInterceptorBindingType />
- <myapp:TestNamed />
+ <Named />
</myapp:TestStereotype>
<myapp:Order>
@@ -36,7 +36,8 @@
<myapp:val />
<Integer />
</myapp:Order>
- <myapp:PaymentResource>
+<!--
+ <myapp:PaymentService>
<RequestScoped />
<myapp:TestBindingType />
<myapp:TestInterceptorBindingType />
@@ -45,8 +46,15 @@
<Resource>
<name>java:app/service/PaymentService</name>
</Resource>
- </myapp:PaymentResource>
-
+ </myapp:PaymentService>
+-->
+
+ <Topic>
+ <Resource>
+ <name>java:app/service/PaymentService</name>
+ </Resource>
+ </Topic>
+
<Decorators>
<myapp:TestDecorator />
</Decorators>
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2635 - ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser and 6 other directories.
by webbeans-commits＠lists.jboss.org
Author: vitold
Date: 2009-04-30 04:45:48 -0400 (Thu, 30 Apr 2009)
New Revision: 2635
Added:
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/foo/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/foo/schema.xsd
Removed:
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/PaymentResource.java
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/notvalid/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java
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/schema/SchemaValidationTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/Order.java
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/schema.xsd
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/valid/schema.xsd
Log:
fix WBRI-254 Namespace schema validation being applied to entire beans.xml file
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-29 15:16:02 UTC (rev 2634)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java 2009-04-30 08:45:48 UTC (rev 2635)
@@ -17,6 +17,7 @@
package org.jboss.webbeans.xml;
import java.io.IOException;
+import java.io.InputStream;
import java.lang.annotation.Annotation;
import java.net.URL;
import java.util.ArrayList;
@@ -28,15 +29,13 @@
import java.util.Set;
import javax.inject.DefinitionException;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-import javax.xml.validation.Validator;
import org.dom4j.Attribute;
+import org.dom4j.DocumentException;
import org.dom4j.Element;
import org.dom4j.Namespace;
import org.dom4j.QName;
+import org.dom4j.io.SAXReader;
import org.jboss.webbeans.introspector.AnnotatedClass;
import org.jboss.webbeans.resources.spi.ResourceLoadingException;
import org.xml.sax.SAXException;
@@ -132,7 +131,7 @@
throw new DefinitionException("There are multiple packages containing a Java type with the same name '" + className + "'");
}
- public static void checkRootAttributes(Element root, Map<String, Set<String>> packagesMap, XmlEnvironment environment, URL xmlUrl)
+ public static void checkRootAttributes(Element root, Map<String, Set<String>> packagesMap, XmlEnvironment environment, URL xmlUrl, Set<URL> schemas)
{
Iterator<?> rootAttrIterator = root.attributeIterator();
while (rootAttrIterator.hasNext())
@@ -167,7 +166,7 @@
if (schemaUrl == null)
throw new DefinitionException("Could not find '" + XmlConstants.SCHEMA_FILE_NAME +
"' file according to specified URN '" + urn + "'");
- validateXmlWithXsd(xmlUrl, schemaUrl);
+ schemas.add(schemaUrl);
}
}
@@ -175,7 +174,7 @@
}
}
- public static void checkRootDeclaredNamespaces(Element root, Map<String, Set<String>> packagesMap, XmlEnvironment environment, URL xmlUrl)
+ public static void checkRootDeclaredNamespaces(Element root, Map<String, Set<String>> packagesMap, XmlEnvironment environment, URL xmlUrl, Set<URL> schemas)
{
Iterator<?> namespacesIterator = root.declaredNamespaces().iterator();
while (namespacesIterator.hasNext())
@@ -190,7 +189,7 @@
URL schemaUrl = environment.loadFileByUrn(uri, XmlConstants.SCHEMA_FILE_NAME);
if (schemaUrl != null)
- validateXmlWithXsd(xmlUrl, schemaUrl);
+ schemas.add(schemaUrl);
URL namespaceFile = environment.loadFileByUrn(uri, XmlConstants.NAMESPACE_FILE_NAME);
if (namespaceFile != null)
@@ -208,26 +207,36 @@
}
}
- private static void validateXmlWithXsd(URL xmlUrl, URL schemaUrl)
+ public static void validateXmlWithXsd(URL xmlUrl, Set<URL> schemas)
{
try
- {
- final StreamSource stream = new StreamSource(xmlUrl.toExternalForm());
- final SchemaFactory schemaFactory = SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema");
- final Schema schema = schemaFactory.newSchema(schemaUrl);
- final Validator validator = schema.newValidator();
- validator.validate(stream);
+ {
+ List<InputStream> schemaStreams = new ArrayList<InputStream>();
+ for (URL schema : schemas)
+ {
+ schemaStreams.add(schema.openStream());
+ }
+
+ SAXReader reader = new SAXReader(true);
+ reader.setProperty("http://java.sun.com/xml/jaxp/properties/schemaLanguage", "http://www.w3.org/2001/XMLSchema");
+ reader.setProperty("http://java.sun.com/xml/jaxp/properties/schemaSource", schemaStreams.toArray());
+ reader.read(xmlUrl.openStream());
}
catch (SAXException e)
{
- String message = "SAXException while validate " + xmlUrl + " with " + schemaUrl;
+ String message = "SAXException while validate " + xmlUrl + " with " + schemas;
throw new DefinitionException(message, e);
}
catch (IOException e)
{
- String message = "IOException while validate " + xmlUrl + " with " + schemaUrl;
+ String message = "IOException while validate " + xmlUrl + " with " + schemas;
throw new DefinitionException(message, e);
}
+ catch (DocumentException e)
+ {
+ String message = "DocumentException while validate " + xmlUrl + " with " + schemas;
+ throw new DefinitionException(message, e);
+ }
}
public static List<Element> findElementsInEeNamespace(Element elementParent, String elementName)
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java 2009-04-29 15:16:02 UTC (rev 2634)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java 2009-04-30 08:45:48 UTC (rev 2635)
@@ -22,6 +22,7 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -194,9 +195,16 @@
{
return null;
}
+
+ Set<URL> schemas = new HashSet<URL>();
+
SAXReader reader = new SAXReader();
Document document = reader.read(xmlStream);
- fullFillPackagesMap(document, url);
+ fullFillPackagesMap(document, url, schemas);
+
+ if (schemas.size() > 0)
+ ParseXmlHelper.validateXmlWithXsd(url, schemas);
+
return document;
}
catch (IOException e)
@@ -344,10 +352,10 @@
throw new DefinitionException("Can't determine type of bean element <" + beanElement.getName() + ">");
}
- private void fullFillPackagesMap(Document document, URL xmlUrl)
+ private void fullFillPackagesMap(Document document, URL xmlUrl, Set<URL> schemas)
{
Element root = document.getRootElement();
- ParseXmlHelper.checkRootAttributes(root, packagesMap, environment, xmlUrl);
- ParseXmlHelper.checkRootDeclaredNamespaces(root, packagesMap, environment, xmlUrl);
+ ParseXmlHelper.checkRootAttributes(root, packagesMap, environment, xmlUrl, schemas);
+ ParseXmlHelper.checkRootDeclaredNamespaces(root, packagesMap, environment, xmlUrl, schemas);
}
}
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-29 15:16:02 UTC (rev 2634)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-04-30 08:45:48 UTC (rev 2635)
@@ -58,7 +58,7 @@
assert parserEnv.getClasses().size() == 1;
}
- @Test
+// @Test
public void testDd()
{
XmlEnvironment parserEnv = new MockXmlEnvironment(getResources("user-defined-beans.xml"), new EjbDescriptorCache());
@@ -69,6 +69,7 @@
Set<Bean<Order>> beansSet = manager.resolveByType(Order.class);
List<Class<? extends Annotation>> dTypes = manager.getEnabledDeploymentTypes();
+ dTypes.size();
for(Bean<Order> bean : beansSet)
{
Class<? extends Annotation> deploymentType = bean.getDeploymentType();
Modified: 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 2009-04-29 15:16:02 UTC (rev 2634)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java 2009-04-30 08:45:48 UTC (rev 2635)
@@ -20,7 +20,6 @@
@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" ),
@Resource(source="/org/jboss/webbeans/test/unit/xml/parser/schema/namespace", destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/parser/schema/namespace" ),
@Resource(source="/org/jboss/webbeans/test/unit/xml/parser/schema/schema.xsd", destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/parser/schema/schema.xsd" ),
- @Resource(source="/org/jboss/webbeans/test/unit/xml/parser/schema/notvalid/schema.xsd", destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/parser/schema/notvalid/schema.xsd" ),
@Resource(source="/org/jboss/webbeans/test/unit/xml/parser/schema/valid/schema.xsd", destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/parser/schema/valid/schema.xsd" )
})
@Classes(
@@ -46,6 +45,6 @@
XmlParser parser = new XmlParser(parserEnv);
parser.parse();
- assert false;
+ assert false : "file '/org/jboss/webbeans/test/unit/xml/parser/schema/not-valid-beans.xml' matching '/org/jboss/webbeans/test/unit/xml/parser/schema/schema.xsd'";
}
}
\ No newline at end of file
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/Order.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/Order.java 2009-04-29 15:16:02 UTC (rev 2634)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/Order.java 2009-04-30 08:45:48 UTC (rev 2635)
@@ -1,18 +1,7 @@
package org.jboss.webbeans.test.unit.xml.parser.schema.foo;
-import javax.context.RequestScoped;
import javax.inject.Initializer;
-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 int val;
Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/PaymentResource.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/PaymentResource.java 2009-04-29 15:16:02 UTC (rev 2634)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/PaymentResource.java 2009-04-30 08:45:48 UTC (rev 2635)
@@ -1,7 +0,0 @@
-package org.jboss.webbeans.test.unit.xml.parser.schema.foo;
-
-
-public class PaymentResource
-{
-
-}
Modified: 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 2009-04-29 15:16:02 UTC (rev 2634)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/beans.xml 2009-04-30 08:45:48 UTC (rev 2635)
@@ -1,14 +1,7 @@
<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>
-
+ xsi:schemaLocation="urn:java:org.jboss.webbeans.test.unit.xml.parser.schema.valid http://mydomain.com/myapp/schema-1.2.xsd">
<myapp:Order>
<Array>
<String />
Modified: 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 2009-04-29 15:16:02 UTC (rev 2634)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/namespace 2009-04-30 08:45:48 UTC (rev 2635)
@@ -1,2 +1 @@
-org.jboss.webbeans.test.unit.xml.beans.annotationtype
org.jboss.webbeans.test.unit.xml.parser.schema.foo
\ No newline at end of file
Modified: 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 2009-04-29 15:16:02 UTC (rev 2634)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/not-valid-beans.xml 2009-04-30 08:45:48 UTC (rev 2635)
@@ -1,20 +1,13 @@
<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>
+ xsi:schemaLocation="urn:java:org.jboss.webbeans.test.unit.xml.parser.schema.valid http://mydomain.com/myapp/schema-1.2.xsd">
+ <myapp:NotValidOrder>
<Array>
<String />
</Array>
<myapp:getVal />
<myapp:val />
<Integer />
- </myapp:Order>
+ </myapp:NotValidOrder>
</Beans>
\ No newline at end of file
Modified: 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 2009-04-29 15:16:02 UTC (rev 2634)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/schema.xsd 2009-04-30 08:45:48 UTC (rev 2635)
@@ -1,5 +1,5 @@
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:java:ee">
- <xs:element name="Beans">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:java:org.jboss.webbeans.test.unit.xml.parser.schema">
+ <xs:element name="Order">
<xs:complexType>
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:any namespace="##any" processContents="skip" />
Modified: 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 2009-04-29 15:16:02 UTC (rev 2634)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/valid/schema.xsd 2009-04-30 08:45:48 UTC (rev 2635)
@@ -2,7 +2,7 @@
<xs:element name="Beans">
<xs:complexType>
<xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:any namespace="##any" processContents="skip" />
+ <xs:any namespace="##any" processContents="strict" />
</xs:sequence>
<xs:anyAttribute namespace="##any" processContents="skip" />
</xs:complexType>
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/foo/schema.xsd
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/foo/schema.xsd (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/foo/schema.xsd 2009-04-30 08:45:48 UTC (rev 2635)
@@ -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
Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd 2009-04-29 15:16:02 UTC (rev 2634)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd 2009-04-30 08:45:48 UTC (rev 2635)
@@ -1,10 +0,0 @@
-<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
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2634 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/xml/namespace/javaee and 9 other directories.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-04-29 11:16:02 -0400 (Wed, 29 Apr 2009)
New Revision: 2634
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/ArrayTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerAddress.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerName.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/LineItem.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PrimitiveTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/Product.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PurchaseOrder.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/ShipTo.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/TypeMemberTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/TypedParameterTest.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/array-beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/member-beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/primitive-beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/typeparam-beans.xml
Removed:
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/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/namespace
Modified:
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/notdeclared/NotDeclaredNamespaceTest.java
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/notdeclared/beans.xml
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
Additional new tests added for namespaces and types XML tests.
Deleted: 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-29 09:15:52 UTC (rev 2633)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/JavaEeNamespaceTest.java 2009-04-29 15:16:02 UTC (rev 2634)
@@ -1,65 +0,0 @@
-package org.jboss.jsr299.tck.tests.xml.namespace.javaee;
-
-import java.lang.reflect.Type;
-import java.util.Set;
-
-import javax.context.RequestScoped;
-import javax.inject.manager.Bean;
-import javax.inject.manager.Manager;
-
-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.foo.AnotherDeploymentType;
-import org.jboss.jsr299.tck.tests.xml.namespace.javaee.foo.Order;
-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.testharness.impl.packaging.jsr299.BeansXml;
-import org.testng.annotations.Test;
-
-@Artifact
-@Resources( { @Resource(source = "namespace", destination = "WEB-INF/classes/org/jboss/jsr299/tck/tests/xml/namespace/javaee/namespace") })
-@Classes( { Order.class, AnotherDeploymentType.class })
-@BeansXml("beans.xml")
-public class JavaEeNamespaceTest extends AbstractJSR299Test
-{
- @Test
- @SpecAssertions( { @SpecAssertion(section = "9.1", id = "e"), @SpecAssertion(section = "9.1", id = "f"), @SpecAssertion(section = "9.2", id = "f"), @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()
- {
- Manager manager = getCurrentManager();
- Set<Bean<Order>> beans = manager.resolveByType(Order.class);
-
- assert beans.size() == 1;
-
- for (Bean<Order> bean : beans)
- {
- assert bean.getDeploymentType().equals(AnotherDeploymentType.class);
- assert bean.getScopeType().equals(RequestScoped.class);
-
- Set<? extends Type> beanTypes = bean.getTypes();
- assert beanTypes.contains(Order.class);
-
- Class<?> clazz = Order.class;
- try
- {
- assert clazz.getDeclaredConstructor(int.class) != null;
- assert clazz.getDeclaredField("strArr").getType().equals(String[].class);
- }
- catch (SecurityException e)
- {
- assert false : "SecurityException while getting constructor with 'int' parameter from '" + clazz + "'";
- }
- catch (NoSuchMethodException e)
- {
- assert false : "Can not find constructor with 'int' parameter in '" + clazz + "'";
- }
- catch (NoSuchFieldException e)
- {
- assert false : "Can not find field 'strArr' in '" + clazz + "'";
- }
- }
- }
-}
Modified: 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 2009-04-29 09:15:52 UTC (rev 2633)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/Order.java 2009-04-29 15:16:02 UTC (rev 2634)
@@ -5,10 +5,9 @@
import javax.context.RequestScoped;
import javax.ejb.TimerHandle;
import javax.event.Event;
-import javax.inject.Initializer;
import javax.interceptor.InvocationContext;
import javax.persistence.EntityManager;
-import javax.sql.CommonDataSource;
+import javax.sql.DataSource;
import javax.xml.ws.Binding;
@RequestScoped
@@ -19,13 +18,12 @@
private final 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, TimerHandle schedule,
+ public Order(Integer integer, Date date, DataSource source, InvocationContext invocation, Event<String> e, TimerHandle schedule,
EntityManager entityManager, Binding binding)
{
this.integer = integer;
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/ArrayTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/ArrayTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/ArrayTest.java 2009-04-29 15:16:02 UTC (rev 2634)
@@ -0,0 +1,47 @@
+/*
+ * 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.namespace.javatypes;
+
+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.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+/**
+ * Tests use of the <Array> element in XML.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+@BeansXml("array-beans.xml")
+public class ArrayTest extends AbstractJSR299Test
+{
+ @Test(groups = { "broken", "xml" })
+ @SpecAssertions({
+ @SpecAssertion(section="9.2.1", id="d")
+ })
+ //TODO Cannot test array element since there is no defined place for it to appear
+ public void testArrayElement()
+ {
+ //TODO Test is using array on constructor, but that is not injectable
+ assert false;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/ArrayTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerAddress.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerAddress.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerAddress.java 2009-04-29 15:16:02 UTC (rev 2634)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.xml.namespace.javatypes;
+
+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
+@interface CurrentCustomerAddress
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerAddress.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerName.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerName.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerName.java 2009-04-29 15:16:02 UTC (rev 2634)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.xml.namespace.javatypes;
+
+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
+@interface CurrentCustomerName
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerName.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/LineItem.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/LineItem.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/LineItem.java 2009-04-29 15:16:02 UTC (rev 2634)
@@ -0,0 +1,42 @@
+package org.jboss.jsr299.tck.tests.xml.namespace.javatypes;
+
+class LineItem
+{
+ private String description = "";
+ private String productId = "";
+ private Integer quantity = 0;
+ private Double amount = 0.0d;
+
+ public String getDescription()
+ {
+ return description;
+ }
+ public void setDescription(String description)
+ {
+ this.description = description;
+ }
+ public String getProductId()
+ {
+ return productId;
+ }
+ public void setProductId(String productId)
+ {
+ this.productId = productId;
+ }
+ public Integer getQuantity()
+ {
+ return quantity;
+ }
+ public void setQuantity(Integer quantity)
+ {
+ this.quantity = quantity;
+ }
+ public Double getAmount()
+ {
+ return amount;
+ }
+ public void setAmount(Double amount)
+ {
+ this.amount = amount;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/LineItem.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PrimitiveTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PrimitiveTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PrimitiveTest.java 2009-04-29 15:16:02 UTC (rev 2634)
@@ -0,0 +1,67 @@
+/*
+ * 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.namespace.javatypes;
+
+import javax.inject.AnnotationLiteral;
+
+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.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+/**
+ * Tests related to primitive Java types in XML.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+@BeansXml("primitive-beans.xml")
+public class PrimitiveTest extends AbstractJSR299Test
+{
+ @Test(groups = { "broken", "xml" })
+ @SpecAssertions({
+ @SpecAssertion(section="9.2.1", id="e")
+ })
+ //TODO Test relies on section 9.5 behavior which is not supported
+ //TODO Test requires bug WBRI-244 to be fixed
+ public void testPrimitiveType() throws Exception
+ {
+ new RunInDependentContext()
+ {
+
+ @Override
+ protected void execute() throws Exception
+ {
+ StringBuilder customerName = getCurrentManager().getInstanceByType(StringBuilder.class, new AnnotationLiteral<CurrentCustomerName>(){});
+ StringBuilder customerAddress = getCurrentManager().getInstanceByType(StringBuilder.class, new AnnotationLiteral<CurrentCustomerAddress>(){});
+ customerName.append("Customer");
+ customerAddress.append("Address");
+ ShipTo shipTo = getCurrentManager().getInstanceByType(ShipTo.class);
+ assert shipTo.getName() != null;
+ assert shipTo.getAddress() != null;
+ assert shipTo.getName().equals("Customer");
+ assert shipTo.getAddress().equals("Address");
+ }
+
+ }.run();
+
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PrimitiveTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/Product.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/Product.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/Product.java 2009-04-29 15:16:02 UTC (rev 2634)
@@ -0,0 +1,28 @@
+package org.jboss.jsr299.tck.tests.xml.namespace.javatypes;
+
+class Product
+{
+ private int[] inventories;
+ private String prodId;
+
+ public Product()
+ {
+
+ }
+
+ public Product(String productId, int[] currentInventories)
+ {
+ this.prodId = productId;
+ this.inventories = currentInventories;
+ }
+
+ public int[] getInventories()
+ {
+ return inventories;
+ }
+
+ public String getProdId()
+ {
+ return prodId;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/Product.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PurchaseOrder.java (from rev 2631, 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/javatypes/PurchaseOrder.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PurchaseOrder.java 2009-04-29 15:16:02 UTC (rev 2634)
@@ -0,0 +1,34 @@
+package org.jboss.jsr299.tck.tests.xml.namespace.javatypes;
+
+import java.util.ArrayList;
+
+import javax.context.RequestScoped;
+
+@RequestScoped
+class PurchaseOrder
+{
+ private int val;
+
+ private ArrayList<String> strArr = new ArrayList<String>();
+
+ public PurchaseOrder()
+ {
+ this.val = 0;
+ }
+
+ public PurchaseOrder(Integer val, ArrayList<String> strArray)
+ {
+ this.val = val;
+ this.strArr = strArray;
+ }
+
+ public int getVal()
+ {
+ return this.val;
+ }
+
+ public ArrayList<String> getStrArr()
+ {
+ return this.strArr;
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/ShipTo.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/ShipTo.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/ShipTo.java 2009-04-29 15:16:02 UTC (rev 2634)
@@ -0,0 +1,28 @@
+package org.jboss.jsr299.tck.tests.xml.namespace.javatypes;
+
+class ShipTo
+{
+ private StringBuilder name;
+ private StringBuilder address;
+
+ public StringBuilder getName()
+ {
+ return name;
+ }
+
+ public void setName(StringBuilder name)
+ {
+ this.name = name;
+ }
+
+ public StringBuilder getAddress()
+ {
+ return address;
+ }
+
+ public void setAddress(StringBuilder address)
+ {
+ this.address = address;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/ShipTo.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/TypeMemberTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/TypeMemberTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/TypeMemberTest.java 2009-04-29 15:16:02 UTC (rev 2634)
@@ -0,0 +1,52 @@
+/*
+ * 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.namespace.javatypes;
+
+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.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+/**
+ * Confirms correct behavior of interpreting members of another Java
+ * type in XML.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+@BeansXml("member-beans.xml")
+public class TypeMemberTest extends AbstractJSR299Test
+{
+ @Test(groups = { "broken", "xml" })
+ @SpecAssertions({
+ @SpecAssertion(section="9.1", id="f"),
+ @SpecAssertion(section="9.2", id="f")
+ })
+ //TODO Cannot test type members since w/o 9.5 there is no defined behavior to test
+ public void testTypeMembers()
+ {
+ LineItem lineItem = getCurrentManager().getInstanceByType(LineItem.class);
+ assert lineItem.getAmount().equals(42.50d);
+ assert lineItem.getDescription().equals("Line item 1");
+ assert lineItem.getProductId().equals("prod-1");
+ assert lineItem.getQuantity().equals(42);
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/TypeMemberTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/TypedParameterTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/TypedParameterTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/TypedParameterTest.java 2009-04-29 15:16:02 UTC (rev 2634)
@@ -0,0 +1,47 @@
+/*
+ * 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.namespace.javatypes;
+
+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.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+/**
+ * Only tests specifying types with a type parameter via XML.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+@BeansXml("typeparam-beans.xml")
+public class TypedParameterTest extends AbstractJSR299Test
+{
+ @Test(groups = { "broken", "xml" })
+ @SpecAssertions({
+ @SpecAssertion(section="9.1", id="e")
+ })
+ //TODO Fix test by adding some class to the XML with a type parameter
+ public void testTypeParameterForEEType()
+ {
+ PurchaseOrder purchaseOrder = getCurrentManager().getInstanceByType(PurchaseOrder.class);
+ assert purchaseOrder.getStrArr() != null;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/TypedParameterTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/NotDeclaredNamespaceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/NotDeclaredNamespaceTest.java 2009-04-29 09:15:52 UTC (rev 2633)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/NotDeclaredNamespaceTest.java 2009-04-29 15:16:02 UTC (rev 2634)
@@ -15,7 +15,7 @@
@ExpectedDeploymentException(DefinitionException.class)
public class NotDeclaredNamespaceTest extends AbstractJSR299Test
{
- @Test
+ @Test(groups = { "xml" })
@SpecAssertions({
@SpecAssertion(section="9", id="e")
})
Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/beans.xml 2009-04-29 09:15:52 UTC (rev 2633)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/beans.xml 2009-04-29 15:16:02 UTC (rev 2634)
@@ -1,18 +0,0 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.namespace.javaee">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
- <test:Order>
- <RequestScoped />
- <test:AnotherDeploymentType />
- <Integer />
- <Array>
- <String />
- </Array>
- <test:val/>
- <test:getVal />
- </test:Order>
-</Beans>
\ No newline at end of file
Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/namespace
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/namespace 2009-04-29 09:15:52 UTC (rev 2633)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/namespace 2009-04-29 15:16:02 UTC (rev 2634)
@@ -1,2 +0,0 @@
-org.jboss.jsr299.tck.tests.xml.namespace.javaee
-org.jboss.jsr299.tck.tests.xml.namespace.javaee.foo
\ No newline at end of file
Modified: 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 2009-04-29 09:15:52 UTC (rev 2633)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/beans.xml 2009-04-29 15:16:02 UTC (rev 2634)
@@ -10,9 +10,11 @@
<test:TestBindingType />
<Integer />
<Date />
- <CommonDataSource />
+ <DataSource />
<InvocationContext />
- <Event />
+ <Event>
+ <String />
+ </Event>
<TimerHandle />
<EntityManager />
<Binding />
@@ -24,7 +26,7 @@
javax.context.RequestScoped;
java.lang.Integer;
java.util.Date;
- javax.sql.CommonDataSource;
+ javax.sql.DataSource;
javax.interceptor.InvocationContext;
javax.event.Event;
javax.ejb.ScheduleExpression;
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/array-beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/array-beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/array-beans.xml 2009-04-29 15:16:02 UTC (rev 2634)
@@ -0,0 +1,13 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.namespace.javatypes">
+ <Deploy>
+ <Standard />
+ <Production />
+ </Deploy>
+ <test:Product>
+ <String />
+ <Array>
+ <Integer />
+ </Array>
+ </test:Product>
+</Beans>
\ No newline at end of file
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/array-beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/member-beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/member-beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/member-beans.xml 2009-04-29 15:16:02 UTC (rev 2634)
@@ -0,0 +1,13 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.namespace.javatypes">
+ <Deploy>
+ <Standard />
+ <Production />
+ </Deploy>
+ <test:LineItem>
+ <test:amount>42.50</test:amount>
+ <test:quantity>42</test:quantity>
+ <test:description>Line item 1</test:description>
+ <test:productId>prod-1</test:productId>
+ </test:LineItem>
+</Beans>
\ No newline at end of file
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/member-beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/primitive-beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/primitive-beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/primitive-beans.xml 2009-04-29 15:16:02 UTC (rev 2634)
@@ -0,0 +1,21 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.namespace.javatypes">
+ <Deploy>
+ <Standard />
+ <Production />
+ </Deploy>
+ <StringBuilder>
+ <test:CurrentCustomerName />
+ </StringBuilder>
+ <StringBuilder>
+ <test:CurrentCustomerAddress />
+ </StringBuilder>
+ <test:ShipTo>
+ <test:name>
+ <test:CurrentCustomerName />
+ </test:name>
+ <test:address>
+ <test:CurrentCustomerAddress />
+ </test:address>
+ </test:ShipTo>
+</Beans>
\ No newline at end of file
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/primitive-beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/typeparam-beans.xml (from rev 2631, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/beans.xml)
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/typeparam-beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/typeparam-beans.xml 2009-04-29 15:16:02 UTC (rev 2634)
@@ -0,0 +1,10 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.namespace.javatypes">
+ <Deploy>
+ <Standard />
+ <Production />
+ </Deploy>
+ <test:PurchaseOrder>
+
+ </test:PurchaseOrder>
+</Beans>
\ No newline at end of file
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/beans.xml 2009-04-29 09:15:52 UTC (rev 2633)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/beans.xml 2009-04-29 15:16:02 UTC (rev 2634)
@@ -1,5 +1,4 @@
-<Beans xmlns="urn:java:ee"
- xmlns:me="urn:java:foo">
+<Beans xmlns="urn:java:ee">
<Deploy>
<Standard />
<Production />
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-04-29 09:15:52 UTC (rev 2633)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-04-29 15:16:02 UTC (rev 2634)
@@ -4555,12 +4555,14 @@
<text>The Java EE namespace |urn:java:ee| represents the following packages: |java.lang|, |java.util|, |javax.annotation|, |javax.inject|, |javax.context|, |javax.interceptor|, |javax.decorator|, |javax.event|, |javax.ejb|, |javax.persistence|, |javax.xml.ws|, |javax.jms|, and |javax.sql|</text>
</assertion>
- <assertion id="b">
+ <assertion id="b" testable="false">
<text>Several elements in the |urn:java:ee| namespace do not represent Java types</text>
+ <note>Intent</note>
</assertion>
- <assertion id="c">
+ <assertion id="c" testable="false">
<text>The root |<Beans>| element, together with the |<Deploy>|, |<Interceptors>| and |<Decorators>| elements belong to the namespace |urn:java:ee| and do not represent Java types nor members of Java types</text>
+ <note>Intent</note>
</assertion>
<assertion id="d">
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2633 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes and 11 other directories.
by webbeans-commits＠lists.jboss.org
Author: vitold
Date: 2009-04-29 05:15:52 -0400 (Wed, 29 Apr 2009)
New Revision: 2633
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/foo/Order.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/TestBindingType.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd
Removed:
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/foo/
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/DeploymentDeclarationTest.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/namespace/javaee/JavaEeNamespaceTest.java
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/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/declaration/deployment/beans.xml
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/namespace/javaee/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/beans.xml
Log:
some minor changes
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java 2009-04-28 21:04:44 UTC (rev 2632)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java 2009-04-29 09:15:52 UTC (rev 2633)
@@ -125,9 +125,9 @@
Element root = document.getRootElement();
List<Class<? extends Annotation>> bindingTypes = new ArrayList<Class<? extends Annotation>>();
+ List<Class<? extends Annotation>> stereotypes = new ArrayList<Class<? extends Annotation>>();
List<Class<? extends Annotation>> interceptorBindingTypes = new ArrayList<Class<? extends Annotation>>();
- List<Class<? extends Annotation>> stereotypes = new ArrayList<Class<? extends Annotation>>();
-
+
Iterator<?> elIterator = root.elementIterator();
while (elIterator.hasNext())
{
@@ -136,26 +136,28 @@
boolean isInterceptorBindingType = ParseXmlHelper.findElementsInEeNamespace(element, XmlConstants.INTERCEPTOR_BINDING_TYPE).size() > 0;
boolean isStereotype = ParseXmlHelper.findElementsInEeNamespace(element, XmlConstants.STEREOTYPE).size() > 0;
- if (isBindingType || isInterceptorBindingType || isStereotype)
+ if (isBindingType || isStereotype || isInterceptorBindingType)
{
Class<? extends Annotation> annotationType = ParseXmlHelper.loadAnnotationClass(element, Annotation.class, environment, packagesMap);
if (isBindingType)
+ {
bindingTypes.add(annotationType);
- if (isInterceptorBindingType)
- {
- interceptorBindingTypes.add(annotationType);
- checkForInterceptorBindingTypeChildren(element);
}
if (isStereotype)
{
stereotypes.add(annotationType);
checkForStereotypeChildren(element);
}
+ if (isInterceptorBindingType)
+ {
+ interceptorBindingTypes.add(annotationType);
+ checkForInterceptorBindingTypeChildren(element);
+ }
}
}
ParseXmlHelper.checkForUniqueElements(bindingTypes);
+ ParseXmlHelper.checkForUniqueElements(stereotypes);
ParseXmlHelper.checkForUniqueElements(interceptorBindingTypes);
- ParseXmlHelper.checkForUniqueElements(stereotypes);
}
private void parseForBeans(Document document)
@@ -237,7 +239,7 @@
stereotypeClass.isAnnotationPresent(ScopeType.class) ||
stereotypeClass.isAnnotationPresent(DeploymentType.class) ||
stereotypeClass.isAnnotationPresent(InterceptorBindingType.class) ||
- stereotypeClass.isAnnotationPresent(Named.class))
+ stereotypeClass.equals(Named.class))
continue;
throw new DefinitionException("Direct child <" + stereotypeChild.getName() + "> of stereotype <" + stereotypeElement.getName() +
"> declaration must be scope type, or deployment type, or interceptor binding type, or javax.annotation.Named");
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestStereotype.java 2009-04-28 21:04:44 UTC (rev 2632)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestStereotype.java 2009-04-29 09:15:52 UTC (rev 2633)
@@ -6,8 +6,11 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.annotation.Named;
+
@Retention(RUNTIME)
@Target(TYPE)
+@Named
@interface TestStereotype
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/DeploymentDeclarationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/DeploymentDeclarationTest.java 2009-04-28 21:04:44 UTC (rev 2632)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/DeploymentDeclarationTest.java 2009-04-29 09:15:52 UTC (rev 2633)
@@ -1,8 +1,14 @@
package org.jboss.jsr299.tck.tests.xml.declaration.deployment;
+import java.util.Set;
+
+import javax.inject.manager.Bean;
+import javax.inject.manager.Manager;
+
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.declaration.deployment.foo.Order;
import org.jboss.jsr299.tck.tests.xml.declaration.deployment.foo.TestDeploymentType;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Classes;
@@ -10,7 +16,7 @@
import org.testng.annotations.Test;
@Artifact
-(a)Classes({TestDeploymentType.class})
+(a)Classes({Order.class, TestDeploymentType.class})
@BeansXml("beans.xml")
public class DeploymentDeclarationTest extends AbstractJSR299Test
{
@@ -21,6 +27,10 @@
})
public void testDeploymentDeclaration()
{
- assert true;
+ Manager manager = getCurrentManager();
+ Set<Bean<Order>> beans = manager.resolveByType(Order.class);
+
+ assert beans.size() == 1 : "There is no one or more than one registered beans with type '" + Order.class + "'";
+ assert beans.iterator().next().getDeploymentType().equals(TestDeploymentType.class) : "Deployment type of bean '" + Order.class + "' is not '" + TestDeploymentType.class + "'";
}
}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/foo/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/foo/Order.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/foo/Order.java 2009-04-29 09:15:52 UTC (rev 2633)
@@ -0,0 +1,7 @@
+package org.jboss.jsr299.tck.tests.xml.declaration.deployment.foo;
+
+@TestDeploymentType
+public class Order
+{
+
+}
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-28 21:04:44 UTC (rev 2632)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java 2009-04-29 09:15:52 UTC (rev 2633)
@@ -14,7 +14,7 @@
@Artifact
@Resources({
- @Resource(source="foo/schema.xsd", destination="WEB-INF/classes/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd")
+ @Resource(source="schema.xsd", destination="WEB-INF/classes/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd")
})
@Classes({
Order.class,
@@ -35,7 +35,7 @@
})
public void testXmlBasedMetadata()
{
- assert getCurrentManager().resolveByType(Order.class).size() == 1;
- assert getCurrentManager().resolveByType(AnotherOrder.class).size() == 1;
+ assert getCurrentManager().resolveByType(Order.class).size() == 1 : "There is no one or more than one registered beans with type '" + Order.class + "'";
+ assert getCurrentManager().resolveByType(AnotherOrder.class).size() == 1 : "There is no one or more than one registered beans with type '" + AnotherOrder.class + "'";
}
}
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-28 21:04:44 UTC (rev 2632)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/JavaEeNamespaceTest.java 2009-04-29 09:15:52 UTC (rev 2633)
@@ -1,5 +1,12 @@
package org.jboss.jsr299.tck.tests.xml.namespace.javaee;
+import java.lang.reflect.Type;
+import java.util.Set;
+
+import javax.context.RequestScoped;
+import javax.inject.manager.Bean;
+import javax.inject.manager.Manager;
+
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -13,25 +20,46 @@
import org.testng.annotations.Test;
@Artifact
-@Resources({
- @Resource(source="namespace", destination="WEB-INF/classes/org/jboss/jsr299/tck/tests/xml/namespace/javaee/namespace")
-})
-(a)Classes({Order.class, AnotherDeploymentType.class})
+@Resources( { @Resource(source = "namespace", destination = "WEB-INF/classes/org/jboss/jsr299/tck/tests/xml/namespace/javaee/namespace") })
+@Classes( { Order.class, AnotherDeploymentType.class })
@BeansXml("beans.xml")
public class JavaEeNamespaceTest extends AbstractJSR299Test
{
@Test
- @SpecAssertions({
- @SpecAssertion(section="9.1", id="e"),
- @SpecAssertion(section="9.1", id="f"),
- @SpecAssertion(section="9.2", id="f"),
- @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")
- })
+ @SpecAssertions( { @SpecAssertion(section = "9.1", id = "e"), @SpecAssertion(section = "9.1", id = "f"), @SpecAssertion(section = "9.2", id = "f"), @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;
+ Manager manager = getCurrentManager();
+ Set<Bean<Order>> beans = manager.resolveByType(Order.class);
+
+ assert beans.size() == 1;
+
+ for (Bean<Order> bean : beans)
+ {
+ assert bean.getDeploymentType().equals(AnotherDeploymentType.class);
+ assert bean.getScopeType().equals(RequestScoped.class);
+
+ Set<? extends Type> beanTypes = bean.getTypes();
+ assert beanTypes.contains(Order.class);
+
+ Class<?> clazz = Order.class;
+ try
+ {
+ assert clazz.getDeclaredConstructor(int.class) != null;
+ assert clazz.getDeclaredField("strArr").getType().equals(String[].class);
+ }
+ catch (SecurityException e)
+ {
+ assert false : "SecurityException while getting constructor with 'int' parameter from '" + clazz + "'";
+ }
+ catch (NoSuchMethodException e)
+ {
+ assert false : "Can not find constructor with 'int' parameter in '" + clazz + "'";
+ }
+ catch (NoSuchFieldException e)
+ {
+ assert false : "Can not find field 'strArr' in '" + clazz + "'";
+ }
+ }
}
}
Modified: 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 2009-04-28 21:04:44 UTC (rev 2632)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/JavaEePkgTest.java 2009-04-29 09:15:52 UTC (rev 2633)
@@ -1,9 +1,26 @@
package org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Date;
+import java.util.Set;
+
+import javax.context.RequestScoped;
+import javax.ejb.TimerHandle;
+import javax.event.Event;
+import javax.inject.AnnotationLiteral;
+import javax.inject.manager.Bean;
+import javax.inject.manager.Manager;
+import javax.interceptor.InvocationContext;
+import javax.persistence.EntityManager;
+import javax.sql.CommonDataSource;
+import javax.xml.ws.Binding;
+
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.jsr299.tck.tests.xml.namespace.javaee.pkg.foo.TestBindingType;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Classes;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
@@ -14,12 +31,50 @@
@BeansXml("beans.xml")
public class JavaEePkgTest extends AbstractJSR299Test
{
+ private static final Annotation TEST_BINDING_TYPE = new AnnotationLiteral<TestBindingType>() {};
+
+ private static final Annotation[] bindings = {TEST_BINDING_TYPE};
+
@Test
@SpecAssertions({
@SpecAssertion(section="9.2.1", id="a")
})
public void testJavaEePkg()
{
- assert getCurrentManager().resolveByType(Order.class).size() == 2;
+ Manager manager = getCurrentManager();
+ Set<Bean<Order>> beans = manager.resolveByType(Order.class, bindings);
+
+ assert beans.size() == 1;
+
+ for (Bean<Order> bean : beans)
+ {
+ assert bean.getScopeType().equals(RequestScoped.class);
+
+ Object[] beanBindings = bean.getBindings().toArray();
+ assert beanBindings.length == 1;
+ for (int i = 0; i < beanBindings.length; i++)
+ {
+ Annotation beanBinding = (Annotation) beanBindings[i];
+ assert beanBinding.annotationType().equals(bindings[i].annotationType());
+ }
+
+ Set<? extends Type> beanTypes = bean.getTypes();
+ assert beanTypes.contains(Order.class);
+
+ Class<?> clazz = Order.class;
+ try
+ {
+ assert clazz.getDeclaredConstructor(Integer.class, Date.class, CommonDataSource.class, InvocationContext.class, Event.class,
+ TimerHandle.class, EntityManager.class, Binding.class) != null;
+ }
+ catch (SecurityException e)
+ {
+ assert false : "SecurityException while getting constructor with 'int' parameter from '" + clazz + "'";
+ }
+ catch (NoSuchMethodException e)
+ {
+ assert false : "Can not find constructor with 'int' parameter in '" + clazz + "'";
+ }
+ }
}
}
Modified: 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 2009-04-28 21:04:44 UTC (rev 2632)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/Order.java 2009-04-29 09:15:52 UTC (rev 2633)
@@ -2,19 +2,17 @@
import java.util.Date;
-import javax.annotation.Named;
import javax.context.RequestScoped;
import javax.ejb.TimerHandle;
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
+@TestBindingType
public class Order
{
private final Integer integer;
@@ -33,12 +31,6 @@
this.integer = integer;
this.date = date;
}
-
- @Produces
- public Order getOrder()
- {
- return new Order();
- }
public Integer getInteger()
{
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/TestBindingType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/TestBindingType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/TestBindingType.java 2009-04-29 09:15:52 UTC (rev 2633)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg.foo;
+
+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 TestBindingType
+{
+
+}
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-28 21:04:44 UTC (rev 2632)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml 2009-04-29 09:15:52 UTC (rev 2633)
@@ -15,10 +15,10 @@
</dd:AnotherTestInterceptorBindingType>
<dd:TestStereotype>
<Stereotype />
+ <Named />
<dd:TestScopeType />
<dd:TestDeploymentType />
<dd:AnotherTestInterceptorBindingType />
- <dd:TestNamed />
</dd:TestStereotype>
<dd:AnotherTestStereotype>
<Stereotype />
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/declaration/deployment/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/declaration/deployment/beans.xml 2009-04-28 21:04:44 UTC (rev 2632)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/declaration/deployment/beans.xml 2009-04-29 09:15:52 UTC (rev 2633)
@@ -5,4 +5,7 @@
<Production />
<test:TestDeploymentType />
</Deploy>
+ <test:Order>
+ <test:TestDeploymentType />
+ </test:Order>
</Beans>
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-28 21:04:44 UTC (rev 2632)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/beans.xml 2009-04-29 09:15:52 UTC (rev 2633)
@@ -4,17 +4,16 @@
<Deploy>
<Standard />
<Production />
+ <dd:AnotherDeploymentType />
</Deploy>
<dd:Order>
- <dd:str>
- <value>hello</value>
- </dd:str>
+ <dd:AnotherDeploymentType />
+ <dd:str />
<dd:getStr />
</dd:Order>
<bb:AnotherOrder>
- <bb:str>
- <value>hello one more time</value>
- </bb:str>
+ <dd:AnotherDeploymentType />
+ <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/metadata/schema.xsd
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd 2009-04-29 09:15:52 UTC (rev 2633)
@@ -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: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/beans.xml 2009-04-28 21:04:44 UTC (rev 2632)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/beans.xml 2009-04-29 09:15:52 UTC (rev 2633)
@@ -15,10 +15,4 @@
<test:val/>
<test:getVal />
</test:Order>
- <Decorators>
- <test:TestDecorator />
- </Decorators>
- <Interceptors>
- <test:TestInterceptor />
- </Interceptors>
</Beans>
\ No newline at end of file
Modified: 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 2009-04-28 21:04:44 UTC (rev 2632)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/beans.xml 2009-04-29 09:15:52 UTC (rev 2633)
@@ -1,8 +1,13 @@
<Beans xmlns="urn:java:ee"
xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg.foo">
+ <test:TestBindingType>
+ <BindingType />
+ </test:TestBindingType>
+
<test:Order>
<RequestScoped />
+ <test:TestBindingType />
<Integer />
<Date />
<CommonDataSource />
@@ -11,11 +16,6 @@
<TimerHandle />
<EntityManager />
<Binding />
- <test:getOrder>
- <Produces>
- <test:Order />
- </Produces>
- </test:getOrder>
</test:Order>
</Beans>
@@ -30,6 +30,6 @@
javax.ejb.ScheduleExpression;
javax.persistence.EntityManager;
javax.xml.ws.Binding;
- javax.inject.Produces;
+ javax.inject.BindingType;
javax.annotation.Resource;
-->
\ No newline at end of file
15 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2632 - in ri/trunk/impl/src/main/java/org/jboss/webbeans: bean and 32 other directories.
by webbeans-commits＠lists.jboss.org
Author: nickarls
Date: 2009-04-28 17:04:44 -0400 (Tue, 28 Apr 2009)
New Revision: 2632
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/FacadeImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/InstanceImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/WebBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/PersistenceUnitMethodHandler.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/RemoteEjbMethodHandler.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/ResourceMethodHandler.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/WebServiceMethodHandler.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsMethodHandler.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsTopicBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyProvider.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanInstance.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanProxyMethodHandler.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractFacadeBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractStandardBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/EventBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/FacadeBeanAnnotatedItemTransformer.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InjectionPointBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InstanceBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/ManagerBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextLifecycle.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ConversationContext.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/AbstractAttributeBackedBeanStore.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/EJBApiAbstraction.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/EjbDescriptorCache.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/InternalEjbDescriptor.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/el/Namespace.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/el/RunInDependentContext.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolver.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/event/AsynchronousTransactionalEventNotification.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventManager.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverFactory.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionSynchronizedRunnable.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/NonContextualInjector.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/AnnotatedItemTransformer.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableAnnotatedClass.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableAnnotatedItem.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/Resolver.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedAnnotation.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedConstructor.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ConstructorSignature.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedItem.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/MethodSignature.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedAnnotatedField.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/ConstructorSignatureImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/MethodSignatureImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JsfApiAbstraction.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/CurrentLiteral.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/DeployedLiteral.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/FiresLiteral.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/InitializedLiteral.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/NewLiteral.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ObtainsLiteral.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/AnnotationModel.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/MergedStereotypes.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/MetaDataCache.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/ScopeModel.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/StereotypeModel.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/persistence/DefaultEntityDiscovery.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/persistence/PersistenceApiAbstraction.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/resources/ClassTransformer.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/resources/DefaultResourceLoader.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/resources/ManagerObjectFactory.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ApplicationBeanStore.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ConversationBeanStore.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletApiAbstraction.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/ApiAbstraction.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/EnumerationIterable.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/EnumerationIterator.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/EnumerationVector.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/ListComparator.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Names.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Strings.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Types.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ConcurrentCache.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingCollection.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingConcurrentMap.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingMap.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingObject.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingSet.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/multi/ConcurrentSetHashMultiMap.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/reflection/AnnotationImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/reflection/ParameterizedTypeImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlClass.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlConstants.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/BeanChildrenChecker.java
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/NotSimpleBeanChildrenChecker.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/ResourceBeanChildrenChecker.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/SimpleBeanChildrenChecker.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/impl/BeanChildrenCheckerImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/BeanElementRegistrator.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/JmsResourceElementRegistrator.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/NotSimpleBeanElementRegistrator.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/ResourceElementRegistrator.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/SessionBeanElementRegistrator.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/SimpleBeanElementRegistrator.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/impl/BeanElementRegistratorImpl.java
Log:
Minor. Copyright blocks, WS, typos, import cleanups.
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -75,7 +75,6 @@
*
* @param beans The beans to validate
*/
- @SuppressWarnings("unchecked")
public void validate()
{
final List<Bean<?>> specializedBeans = new ArrayList<Bean<?>>();
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -20,7 +20,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans;
import java.util.Map;
@@ -33,7 +32,7 @@
/**
- * Access point for getting/setting current Managager
+ * Access point for getting/setting current Manager
*
* @author Gavin King
* @author Sanjeeb.Sahoo(a)Sun.COM
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/FacadeImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/FacadeImpl.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/FacadeImpl.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/InstanceImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/InstanceImpl.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/InstanceImpl.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans;
import java.io.InputStream;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/WebBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/WebBean.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/WebBean.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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;
import static java.lang.annotation.ElementType.METHOD;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.bean;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.bean;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.bean;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.bean;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.bean;
import java.lang.reflect.Method;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.bean;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewBean.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewBean.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.bean;
/**
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.bean;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.bean;
import java.lang.reflect.Field;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.bean;
import java.lang.annotation.Annotation;
@@ -27,7 +26,6 @@
import javax.inject.CreationException;
import javax.inject.DefinitionException;
import javax.inject.Disposes;
-import javax.inject.manager.Bean;
import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.bean;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/PersistenceUnitMethodHandler.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/PersistenceUnitMethodHandler.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/PersistenceUnitMethodHandler.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -19,7 +19,6 @@
import org.jboss.webbeans.CurrentManager;
import org.jboss.webbeans.persistence.spi.JpaServices;
-
/**
* Proxy for persistence unit Java EE resources
*
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/RemoteEjbMethodHandler.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/RemoteEjbMethodHandler.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/RemoteEjbMethodHandler.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -16,7 +16,6 @@
*/
package org.jboss.webbeans.bean.ee;
-
import org.jboss.webbeans.CurrentManager;
import org.jboss.webbeans.ejb.spi.EjbServices;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/ResourceMethodHandler.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/ResourceMethodHandler.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/ResourceMethodHandler.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -16,7 +16,6 @@
*/
package org.jboss.webbeans.bean.ee;
-
import org.jboss.webbeans.CurrentManager;
import org.jboss.webbeans.resources.spi.ResourceServices;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/WebServiceMethodHandler.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/WebServiceMethodHandler.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/WebServiceMethodHandler.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -16,7 +16,6 @@
*/
package org.jboss.webbeans.bean.ee;
-
import org.jboss.webbeans.CurrentManager;
import org.jboss.webbeans.ws.spi.WebServices;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsMethodHandler.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsMethodHandler.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsMethodHandler.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -16,8 +16,6 @@
*/
package org.jboss.webbeans.bean.ee.jms;
-
-
import java.lang.reflect.Method;
import javax.context.CreationalContext;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsTopicBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsTopicBean.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsTopicBean.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -29,7 +29,6 @@
import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.bean.ee.AbstractResourceBean;
-
/**
* A bean which represents a JMS topic
*
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.bean.proxy;
import java.io.Serializable;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyProvider.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyProvider.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyProvider.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.bean.proxy;
import java.io.Serializable;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanInstance.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanInstance.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanInstance.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -16,7 +16,6 @@
*/
package org.jboss.webbeans.bean.proxy;
-
/**
* Interface implemented by all enterprise bean proxies to query/control the proxy
*
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanProxyMethodHandler.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanProxyMethodHandler.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanProxyMethodHandler.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,10 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.bean.proxy;
-
import java.lang.reflect.Method;
import javassist.util.proxy.MethodHandler;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractFacadeBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractFacadeBean.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractFacadeBean.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.bean.standard;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractStandardBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractStandardBean.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractStandardBean.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.bean.standard;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/EventBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/EventBean.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/EventBean.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.bean.standard;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/FacadeBeanAnnotatedItemTransformer.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/FacadeBeanAnnotatedItemTransformer.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/FacadeBeanAnnotatedItemTransformer.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.bean.standard;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InjectionPointBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InjectionPointBean.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InjectionPointBean.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.bean.standard;
import java.lang.reflect.Type;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InstanceBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InstanceBean.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InstanceBean.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.bean.standard;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/ManagerBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/ManagerBean.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/ManagerBean.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,5 +1,18 @@
-/**
- *
+/*
+ * 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.bean.standard;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.bootstrap;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.bootstrap;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.bootstrap;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.context;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -20,7 +20,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.context;
import java.util.concurrent.atomic.AtomicBoolean;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextLifecycle.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextLifecycle.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextLifecycle.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -20,7 +20,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.context;
import org.jboss.webbeans.CurrentManager;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ConversationContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ConversationContext.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ConversationContext.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -20,7 +20,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.context;
import javax.context.ConversationScoped;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -20,7 +20,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.context;
import java.util.concurrent.atomic.AtomicInteger;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -20,7 +20,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.context;
import javax.context.RequestScoped;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -20,7 +20,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.context;
import javax.context.SessionScoped;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/AbstractAttributeBackedBeanStore.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/AbstractAttributeBackedBeanStore.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/AbstractAttributeBackedBeanStore.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.context.beanstore;
import java.util.ArrayList;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.conversation;
import javax.annotation.Named;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -38,6 +38,8 @@
@WebBean
public class JavaSEConversationTerminator implements ConversationTerminator, Serializable
{
+ private static final long serialVersionUID = 7258623232951724618L;
+
private static LogProvider log = Logging.getLogProvider(JavaSEConversationTerminator.class);
private ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -35,6 +35,8 @@
@WebBean
public class NumericConversationIdGenerator implements ConversationIdGenerator, Serializable
{
+ private static final long serialVersionUID = -587408626962044442L;
+
private static LogProvider log = Logging.getLogProvider(NumericConversationIdGenerator.class);
// The next conversation ID
private AtomicInteger id;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/EJBApiAbstraction.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/EJBApiAbstraction.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/EJBApiAbstraction.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.ejb;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/EjbDescriptorCache.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/EjbDescriptorCache.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/EjbDescriptorCache.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.ejb;
import java.util.HashMap;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/InternalEjbDescriptor.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/InternalEjbDescriptor.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/InternalEjbDescriptor.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.ejb;
import java.util.Iterator;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.ejb;
import java.io.IOException;
@@ -39,7 +38,8 @@
*/
public class SessionBeanInterceptor implements Serializable
{
-
+ private static final long serialVersionUID = 7327757031821596782L;
+
private transient Log log = Logging.getLog(SessionBeanInterceptor.class);
private transient EnterpriseBean<Object> bean;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/el/Namespace.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/el/Namespace.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/el/Namespace.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.el;
import java.util.HashMap;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/el/RunInDependentContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/el/RunInDependentContext.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/el/RunInDependentContext.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,5 +1,18 @@
-/**
- *
+/*
+ * 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.el;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolver.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolver.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolver.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.el;
import java.beans.FeatureDescriptor;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/AsynchronousTransactionalEventNotification.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/AsynchronousTransactionalEventNotification.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/AsynchronousTransactionalEventNotification.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.event;
import org.jboss.webbeans.context.DependentContext;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.event;
import org.jboss.webbeans.CurrentManager;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventImpl.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventImpl.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.event;
import java.io.Serializable;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventManager.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventManager.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventManager.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.event;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.event;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverFactory.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverFactory.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverFactory.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.event;
import org.jboss.webbeans.ManagerImpl;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.event;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionSynchronizedRunnable.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionSynchronizedRunnable.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionSynchronizedRunnable.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.jboss.webbeans.event;
import static javax.transaction.Status.STATUS_COMMITTED;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.event;
import java.util.ArrayList;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/NonContextualInjector.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/NonContextualInjector.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/NonContextualInjector.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.injection;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/AnnotatedItemTransformer.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/AnnotatedItemTransformer.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/AnnotatedItemTransformer.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.injection.resolution;
import org.jboss.webbeans.introspector.AnnotatedItem;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableAnnotatedClass.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableAnnotatedClass.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableAnnotatedClass.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.injection.resolution;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableAnnotatedItem.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableAnnotatedItem.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableAnnotatedItem.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.injection.resolution;
import org.jboss.webbeans.introspector.AnnotatedItem;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/Resolver.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/Resolver.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/Resolver.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.injection.resolution;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedAnnotation.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedAnnotation.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedAnnotation.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.introspector;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.introspector;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedConstructor.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedConstructor.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedConstructor.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.introspector;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.introspector;
import java.lang.reflect.Field;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.introspector;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.introspector;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.introspector;
import javax.inject.manager.Manager;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.introspector;
import static org.jboss.webbeans.introspector.AnnotatedItem.MAPPED_METAANNOTATIONS;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ConstructorSignature.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ConstructorSignature.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ConstructorSignature.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,6 +1,21 @@
+/*
+ * 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.introspector;
-
public interface ConstructorSignature
{
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedItem.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedItem.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedItem.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.introspector;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/MethodSignature.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/MethodSignature.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/MethodSignature.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,6 +1,21 @@
+/*
+ * 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.introspector;
-
public interface MethodSignature
{
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedAnnotatedField.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedAnnotatedField.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedAnnotatedField.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/package org.jboss.webbeans.introspector;
-
import java.lang.annotation.Annotation;
import java.util.Set;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.introspector.jlr;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.introspector.jlr;
import java.lang.reflect.Member;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.introspector.jlr;
import java.lang.reflect.Modifier;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.introspector.jlr;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.introspector.jlr;
import java.lang.annotation.Annotation;
@@ -64,7 +63,7 @@
// The map from annotation type to abstracted field with meta-annotation
private final SetMultiMap<Class<? extends Annotation>, AnnotatedField<?>> metaAnnotatedFields;
-// The set of abstracted fields
+ // The set of abstracted fields
private final Set<AnnotatedField<?>> declaredFields;
private final Map<String, AnnotatedField<?>> declaredFieldsByName;
// The map from annotation type to abstracted field with annotation
@@ -80,7 +79,7 @@
// The map from annotation type to method with a parameter with annotation
private final SetMultiMap<Class<? extends Annotation>, AnnotatedMethod<?>> methodsByAnnotatedParameters;
-// The set of abstracted methods
+ // The set of abstracted methods
private final Set<AnnotatedMethod<?>> declaredMethods;
// The map from annotation type to abstracted method with annotation
private final SetMultiMap<Class<? extends Annotation>, AnnotatedMethod<?>> declaredAnnotatedMethods;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.introspector.jlr;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.introspector.jlr;
import java.lang.reflect.Field;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.introspector.jlr;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.introspector.jlr;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/ConstructorSignatureImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/ConstructorSignatureImpl.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/ConstructorSignatureImpl.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.introspector.jlr;
import java.util.Arrays;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/MethodSignatureImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/MethodSignatureImpl.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/MethodSignatureImpl.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.introspector.jlr;
import java.util.Arrays;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JsfApiAbstraction.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JsfApiAbstraction.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JsfApiAbstraction.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.jsf;
import org.jboss.webbeans.bootstrap.api.Service;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/CurrentLiteral.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/CurrentLiteral.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/CurrentLiteral.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.literal;
import javax.inject.AnnotationLiteral;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/DeployedLiteral.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/DeployedLiteral.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/DeployedLiteral.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.literal;
import javax.inject.AnnotationLiteral;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/FiresLiteral.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/FiresLiteral.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/FiresLiteral.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.literal;
import javax.event.Fires;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/InitializedLiteral.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/InitializedLiteral.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/InitializedLiteral.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.literal;
import javax.inject.AnnotationLiteral;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/NewLiteral.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/NewLiteral.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/NewLiteral.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.literal;
import javax.inject.AnnotationLiteral;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ObtainsLiteral.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ObtainsLiteral.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ObtainsLiteral.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.literal;
import javax.inject.AnnotationLiteral;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/AnnotationModel.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/AnnotationModel.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/AnnotationModel.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.metadata;
import java.lang.annotation.Annotation;
@@ -22,7 +21,6 @@
import javax.inject.DefinitionException;
import org.jboss.webbeans.introspector.AnnotatedAnnotation;
-import org.jboss.webbeans.introspector.jlr.AnnotatedAnnotationImpl;
import org.jboss.webbeans.resources.ClassTransformer;
/**
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.metadata;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/MergedStereotypes.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/MergedStereotypes.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/MergedStereotypes.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.metadata;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/MetaDataCache.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/MetaDataCache.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/MetaDataCache.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.metadata;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/ScopeModel.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/ScopeModel.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/ScopeModel.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.metadata;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/StereotypeModel.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/StereotypeModel.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/StereotypeModel.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.metadata;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/persistence/DefaultEntityDiscovery.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/persistence/DefaultEntityDiscovery.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/persistence/DefaultEntityDiscovery.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.persistence;
import java.io.ByteArrayInputStream;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/persistence/PersistenceApiAbstraction.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/persistence/PersistenceApiAbstraction.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/persistence/PersistenceApiAbstraction.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.persistence;
import java.lang.annotation.Annotation;
@@ -5,8 +21,6 @@
import org.jboss.webbeans.bootstrap.api.Service;
import org.jboss.webbeans.resources.spi.ResourceLoader;
import org.jboss.webbeans.util.ApiAbstraction;
-import org.jboss.webbeans.util.ApiAbstraction.Dummy;
-import org.jboss.webbeans.util.ApiAbstraction.DummyEnum;
public class PersistenceApiAbstraction extends ApiAbstraction implements Service
{
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/resources/ClassTransformer.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/resources/ClassTransformer.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/resources/ClassTransformer.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.resources;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/resources/DefaultResourceLoader.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/resources/DefaultResourceLoader.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/resources/DefaultResourceLoader.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -19,8 +19,6 @@
import java.io.IOException;
import java.net.URL;
-import org.jboss.webbeans.introspector.AnnotatedClass;
-import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl;
import org.jboss.webbeans.resources.spi.ResourceLoader;
import org.jboss.webbeans.resources.spi.ResourceLoadingException;
import org.jboss.webbeans.util.EnumerationIterable;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/resources/ManagerObjectFactory.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/resources/ManagerObjectFactory.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/resources/ManagerObjectFactory.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.resources;
import java.util.Hashtable;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ApplicationBeanStore.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ApplicationBeanStore.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ApplicationBeanStore.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.servlet;
import java.util.Enumeration;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ConversationBeanStore.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ConversationBeanStore.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ConversationBeanStore.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.servlet;
import javax.servlet.http.HttpSession;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.servlet;
import javax.context.RequestScoped;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletApiAbstraction.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletApiAbstraction.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletApiAbstraction.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.servlet;
import org.jboss.webbeans.bootstrap.api.Service;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -20,7 +20,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.servlet;
import javax.servlet.http.HttpServletRequest;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -20,7 +20,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.servlet;
import javax.servlet.ServletRequestEvent;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/ApiAbstraction.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/ApiAbstraction.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/ApiAbstraction.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.util;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/EnumerationIterable.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/EnumerationIterable.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/EnumerationIterable.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.util;
import java.util.ArrayList;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/EnumerationIterator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/EnumerationIterator.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/EnumerationIterator.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.util;
import java.util.Enumeration;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/EnumerationVector.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/EnumerationVector.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/EnumerationVector.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.util;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/ListComparator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/ListComparator.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/ListComparator.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.util;
import java.util.Comparator;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Names.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Names.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Names.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.util;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.util;
import java.beans.Introspector;
@@ -38,7 +37,6 @@
import org.jboss.webbeans.util.reflection.ParameterizedTypeImpl;
-
/**
* Utility class for static reflection-type operations
*
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Strings.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Strings.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Strings.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.util;
import java.beans.Introspector;
@@ -105,6 +104,13 @@
return buffer.toString();
}
+ /**
+ * Returns a textual representation of a collection for debug purposes
+ *
+ * @param header The description of the collection
+ * @param collection The collection
+ * @return A textual representation
+ */
public static String collectionToString(String header, Collection<?> collection)
{
StringBuilder buffer = new StringBuilder();
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Types.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Types.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Types.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,10 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.util;
-
/**
* Utility class for Types
*
@@ -74,7 +72,7 @@
}
else
{
- throw new IllegalStateException("Some weird type!!!");
+ throw new IllegalStateException("Could not get boxed type for unknown type " + type);
}
}
else
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ConcurrentCache.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ConcurrentCache.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ConcurrentCache.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.util.collections;
import java.util.Map;
@@ -24,7 +23,6 @@
import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
-
/**
* Represents a thread safe map
*
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingCollection.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingCollection.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingCollection.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.util.collections;
import java.util.Collection;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingConcurrentMap.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingConcurrentMap.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingConcurrentMap.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.util.collections;
import java.util.concurrent.ConcurrentMap;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingMap.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingMap.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingMap.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.util.collections;
import java.util.Collection;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingObject.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingObject.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingObject.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.util.collections;
import java.io.Serializable;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingSet.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingSet.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingSet.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.util.collections;
import java.util.Set;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/multi/ConcurrentSetHashMultiMap.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/multi/ConcurrentSetHashMultiMap.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/multi/ConcurrentSetHashMultiMap.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,4 +1,3 @@
-package org.jboss.webbeans.util.collections.multi;
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
@@ -15,6 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.jboss.webbeans.util.collections.multi;
+
import java.util.Collections;
import java.util.Map;
import java.util.Set;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/reflection/AnnotationImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/reflection/AnnotationImpl.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/reflection/AnnotationImpl.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.webbeans.util.reflection;
import java.lang.annotation.Annotation;
@@ -23,7 +22,6 @@
import javax.inject.ExecutionException;
-
/**
* Supports instantiation of annotation type instances.
*
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/reflection/ParameterizedTypeImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/reflection/ParameterizedTypeImpl.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/reflection/ParameterizedTypeImpl.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.util.reflection;
import java.lang.reflect.ParameterizedType;
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-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.xml;
import java.io.IOException;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlClass.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlClass.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlClass.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.xml;
public interface XmlClass
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlConstants.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlConstants.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlConstants.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.xml;
public class XmlConstants
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.xml;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.xml;
import java.io.IOException;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/BeanChildrenChecker.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/BeanChildrenChecker.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/BeanChildrenChecker.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.xml.checker.beanchildren;
import java.util.Map;
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-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.xml.checker.beanchildren.ext;
import java.lang.reflect.Method;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/NotSimpleBeanChildrenChecker.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/NotSimpleBeanChildrenChecker.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/NotSimpleBeanChildrenChecker.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.xml.checker.beanchildren.ext;
import java.util.Map;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/ResourceBeanChildrenChecker.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/ResourceBeanChildrenChecker.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/ResourceBeanChildrenChecker.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.xml.checker.beanchildren.ext;
import java.util.List;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/SimpleBeanChildrenChecker.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/SimpleBeanChildrenChecker.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/SimpleBeanChildrenChecker.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.xml.checker.beanchildren.ext;
import java.util.ArrayList;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/impl/BeanChildrenCheckerImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/impl/BeanChildrenCheckerImpl.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/impl/BeanChildrenCheckerImpl.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.xml.checker.beanchildren.impl;
import java.util.Map;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/BeanElementRegistrator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/BeanElementRegistrator.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/BeanElementRegistrator.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.xml.registrator.bean;
import org.dom4j.Element;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/JmsResourceElementRegistrator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/JmsResourceElementRegistrator.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/JmsResourceElementRegistrator.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.xml.registrator.bean.ext;
import org.dom4j.Element;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/NotSimpleBeanElementRegistrator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/NotSimpleBeanElementRegistrator.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/NotSimpleBeanElementRegistrator.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.xml.registrator.bean.ext;
import org.dom4j.Element;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/ResourceElementRegistrator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/ResourceElementRegistrator.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/ResourceElementRegistrator.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.xml.registrator.bean.ext;
import java.lang.annotation.Annotation;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/SessionBeanElementRegistrator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/SessionBeanElementRegistrator.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/SessionBeanElementRegistrator.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.xml.registrator.bean.ext;
import org.dom4j.Element;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/SimpleBeanElementRegistrator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/SimpleBeanElementRegistrator.java 2009-04-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/SimpleBeanElementRegistrator.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.xml.registrator.bean.ext;
import javax.decorator.Decorator;
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-27 18:32:45 UTC (rev 2631)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/impl/BeanElementRegistratorImpl.java 2009-04-28 21:04:44 UTC (rev 2632)
@@ -1,3 +1,19 @@
+/*
+ * 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.xml.registrator.bean.impl;
import java.lang.reflect.Method;
15 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2631 - in ri/trunk/impl/src/main/java/org/jboss/webbeans: jsf and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-04-27 14:32:45 -0400 (Mon, 27 Apr 2009)
New Revision: 2631
Added:
ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JsfApiAbstraction.java
Removed:
ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JSFApiAbstraction.java
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
Log:
rename for JSFApiAbstraction to JsfApiAbstraction for consistency
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-04-27 15:36:11 UTC (rev 2630)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-04-27 18:32:45 UTC (rev 2631)
@@ -33,7 +33,7 @@
import org.jboss.webbeans.introspector.AnnotatedMethod;
import org.jboss.webbeans.introspector.WrappedAnnotatedField;
import org.jboss.webbeans.introspector.WrappedAnnotatedMethod;
-import org.jboss.webbeans.jsf.JSFApiAbstraction;
+import org.jboss.webbeans.jsf.JsfApiAbstraction;
import org.jboss.webbeans.log.LogProvider;
import org.jboss.webbeans.log.Logging;
import org.jboss.webbeans.persistence.spi.EntityDiscovery;
@@ -289,7 +289,7 @@
{
Class<?> rawType = clazz.getRawType();
EJBApiAbstraction ejbApiAbstraction = manager.getServices().get(EJBApiAbstraction.class);
- JSFApiAbstraction jsfApiAbstraction = manager.getServices().get(JSFApiAbstraction.class);
+ JsfApiAbstraction jsfApiAbstraction = manager.getServices().get(JsfApiAbstraction.class);
ServletApiAbstraction servletApiAbstraction = manager.getServices().get(ServletApiAbstraction.class);
// TODO: check 3.2.1 for more rules!!!!!!
return !Reflections.isAbstract(rawType) &&
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-04-27 15:36:11 UTC (rev 2630)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-04-27 18:32:45 UTC (rev 2631)
@@ -50,7 +50,7 @@
import org.jboss.webbeans.ejb.EjbDescriptorCache;
import org.jboss.webbeans.ejb.spi.EjbServices;
import org.jboss.webbeans.introspector.AnnotatedClass;
-import org.jboss.webbeans.jsf.JSFApiAbstraction;
+import org.jboss.webbeans.jsf.JsfApiAbstraction;
import org.jboss.webbeans.literal.DeployedLiteral;
import org.jboss.webbeans.literal.InitializedLiteral;
import org.jboss.webbeans.log.Log;
@@ -126,7 +126,7 @@
{
ResourceLoader resourceLoader = getServices().get(ResourceLoader.class);
getServices().add(EJBApiAbstraction.class, new EJBApiAbstraction(resourceLoader));
- getServices().add(JSFApiAbstraction.class, new JSFApiAbstraction(resourceLoader));
+ getServices().add(JsfApiAbstraction.class, new JsfApiAbstraction(resourceLoader));
getServices().add(PersistenceApiAbstraction.class, new PersistenceApiAbstraction(resourceLoader));
getServices().add(ServletApiAbstraction.class, new ServletApiAbstraction(resourceLoader));
// Temporary workaround to provide context for building annotated class
Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JSFApiAbstraction.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JSFApiAbstraction.java 2009-04-27 15:36:11 UTC (rev 2630)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JSFApiAbstraction.java 2009-04-27 18:32:45 UTC (rev 2631)
@@ -1,42 +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.jsf;
-
-import org.jboss.webbeans.bootstrap.api.Service;
-import org.jboss.webbeans.resources.spi.ResourceLoader;
-import org.jboss.webbeans.util.ApiAbstraction;
-
-/**
- * Utility class for JSF related components, concepts etc.
- *
- * @author Pete Muir
- *
- */
-public class JSFApiAbstraction extends ApiAbstraction implements Service
-{
-
- // An UI component
- public final Class<?> UICOMPONENT_CLASS;
-
- public JSFApiAbstraction(ResourceLoader resourceLoader)
- {
- super(resourceLoader);
- this.UICOMPONENT_CLASS = classForName("javax.faces.component.UIComponent");
- }
-
-}
Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JsfApiAbstraction.java (from rev 2627, ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JSFApiAbstraction.java)
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JsfApiAbstraction.java (rev 0)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JsfApiAbstraction.java 2009-04-27 18:32:45 UTC (rev 2631)
@@ -0,0 +1,42 @@
+/*
+ * 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.jsf;
+
+import org.jboss.webbeans.bootstrap.api.Service;
+import org.jboss.webbeans.resources.spi.ResourceLoader;
+import org.jboss.webbeans.util.ApiAbstraction;
+
+/**
+ * Utility class for JSF related components, concepts etc.
+ *
+ * @author Pete Muir
+ *
+ */
+public class JsfApiAbstraction extends ApiAbstraction implements Service
+{
+
+ // An UI component
+ public final Class<?> UICOMPONENT_CLASS;
+
+ public JsfApiAbstraction(ResourceLoader resourceLoader)
+ {
+ super(resourceLoader);
+ this.UICOMPONENT_CLASS = classForName("javax.faces.component.UIComponent");
+ }
+
+}
15 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2630 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/xml/metadata and 4 other directories.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-04-27 11:36:11 -0400 (Mon, 27 Apr 2009)
New Revision: 2630
Added:
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/foo/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/foo/schema.xsd
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/AnotherDeploymentType.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd
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/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/resources/org/jboss/jsr299/tck/tests/xml/metadata/beans.xml
Log:
Updated test for XML schema validation; currently marked ri-broken till WBRI-254 is fixed.
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-27 01:34:55 UTC (rev 2629)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java 2009-04-27 15:36:11 UTC (rev 2630)
@@ -15,15 +15,6 @@
@BeansXml("beans.xml")
public class AnnotationTypesTest extends AbstractJSR299Test
{
- @Test(groups = { "stub", "xml" })
- @SpecAssertions({
- @SpecAssertion(section="9", id="d")//without schema
- })
- public void testXMLSchemaUse()
- {
- assert false;
- }
-
@Test(groups = { "ri-broken", "xml" })
@SpecAssertions({
@SpecAssertion(section="9.4", id="a")
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-27 01:34:55 UTC (rev 2629)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java 2009-04-27 15:36:11 UTC (rev 2630)
@@ -3,7 +3,6 @@
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.metadata.foo.AnotherDeploymentType;
import org.jboss.jsr299.tck.tests.xml.metadata.foo.Order;
import org.jboss.jsr299.tck.tests.xml.metadata.foo.another.AnotherOrder;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -15,21 +14,20 @@
@Artifact
@Resources({
- @Resource(source="schema.xsd", destination="WEB-INF/classes/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd")
+ @Resource(source="foo/schema.xsd", destination="WEB-INF/classes/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd")
})
@Classes({
Order.class,
- AnotherOrder.class,
- AnotherDeploymentType.class
+ AnotherOrder.class
})
@BeansXml("beans.xml")
public class XmlBasedMetadataTest extends AbstractJSR299Test
{
- @Test
+ @Test(groups = { "ri-broken", "xml" })
@SpecAssertions({
@SpecAssertion(section="9", id="b"),
@SpecAssertion(section="9", id="c"),
- @SpecAssertion(section="9", id="d"),//with schema
+ @SpecAssertion(section="9", id="d"),
@SpecAssertion(section="9.1", id="a"),
@SpecAssertion(section="9.1", id="b"),
@SpecAssertion(section="9.1", id="c"),
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/AnotherDeploymentType.java 2009-04-27 01:34:55 UTC (rev 2629)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/AnotherDeploymentType.java 2009-04-27 15:36:11 UTC (rev 2630)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.tests.xml.metadata.foo;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-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.DeploymentType;
-
-@Target( { TYPE, METHOD, FIELD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-public @interface AnotherDeploymentType
-{
-
-}
\ No newline at end of file
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-27 01:34:55 UTC (rev 2629)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/Order.java 2009-04-27 15:36:11 UTC (rev 2630)
@@ -1,9 +1,5 @@
package org.jboss.jsr299.tck.tests.xml.metadata.foo;
-import javax.context.Dependent;
-import javax.inject.Current;
-import javax.inject.Initializer;
-import javax.inject.manager.Manager;
public class Order
{
@@ -11,15 +7,6 @@
private boolean active;
- @Initializer
- public Order(@Current Manager manager)
- {
- if (manager.getContext(Dependent.class).isActive())
- {
- active = true;
- }
- }
-
public String getStr()
{
return str;
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-27 01:34:55 UTC (rev 2629)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/another/AnotherOrder.java 2009-04-27 15:36:11 UTC (rev 2630)
@@ -1,9 +1,5 @@
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
{
@@ -11,15 +7,6 @@
private boolean active;
- @Initializer
- public AnotherOrder(@Current Manager manager)
- {
- if (manager.getContext(Dependent.class).isActive())
- {
- active = true;
- }
- }
-
public String getStr()
{
return str;
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-27 01:34:55 UTC (rev 2629)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/beans.xml 2009-04-27 15:36:11 UTC (rev 2630)
@@ -4,7 +4,6 @@
<Deploy>
<Standard />
<Production />
- <dd:AnotherDeploymentType />
</Deploy>
<dd:Order>
<dd:str>
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/foo/schema.xsd
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/foo/schema.xsd (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/foo/schema.xsd 2009-04-27 15:36:11 UTC (rev 2630)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.example.org/schema/" targetNamespace="http://www.example.org/schema/">
+ <element name="Order" type="tns:OrderType"></element>
+ <element name="str" type="tns:StrType"></element>
+
+ <complexType name="StrType">
+ <sequence>
+ <element name="value" type="string"></element>
+ </sequence>
+ </complexType>
+ <complexType name="OrderType">
+ <sequence>
+ <element ref="tns:str"></element>
+ <element name="getStr" />
+ </sequence>
+ </complexType>
+</schema>
\ No newline at end of file
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/foo/schema.xsd
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd 2009-04-27 01:34:55 UTC (rev 2629)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd 2009-04-27 15:36:11 UTC (rev 2630)
@@ -1,10 +0,0 @@
-<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
15 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2629 - ri/trunk/dist.
by webbeans-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-04-26 21:34:55 -0400 (Sun, 26 Apr 2009)
New Revision: 2629
Modified:
ri/trunk/dist/build.xml
Log:
fix typo
Modified: ri/trunk/dist/build.xml
===================================================================
--- ri/trunk/dist/build.xml 2009-04-27 01:18:17 UTC (rev 2628)
+++ ri/trunk/dist/build.xml 2009-04-27 01:34:55 UTC (rev 2629)
@@ -24,7 +24,7 @@
<fail unless="webbeans.wicket.version" message="You must specify the webbeans.wicket.version as a property" />
<fail unless="webbeans.logger.version" message="You must specify the webbeans.logger.version as a property" />
<fail unless="refdoc.dir" message="You must specify the reference docs directory with -Drefdoc.dir=~/workspace/wb/reference" />
- <fail unless="examples.dir" message="You must specify the examples directory with -Dexmaples.dir=~/workspace/wb/examples" />
+ <fail unless="examples.dir" message="You must specify the examples directory with -Dexamples.dir=~/workspace/wb/examples" />
<maven target="clean" basedir="${wbri.dir}" />
<maven target="clean" basedir="${refdoc.dir}" />
15 years, 7 months
- 1
- 0