Author: pete.muir(a)jboss.org Date: 2010-02-20 19:06:35 -0500 (Sat, 20 Feb 2010) New Revision: 5910 Added: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/LabradorImpl.java cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/LaikaImpl.java Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ejb-jar.xml Log: tidy up EJBs Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2010-02-20 23:52:09 UTC (rev 5909) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2010-02-21 00:06:35 UTC (rev 5910) @@ -30,6 +30,7 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; +import org.jboss.testharness.impl.packaging.ear.EjbJarXml; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; @@ -40,6 +41,7 @@ @Artifact @Packaging(PackagingType.EAR) @BeansXml("beans.xml") +(a)EjbJarXml(&quot;ejb-jar.xml&quot;) @SpecVersion(spec="cdi", version="20091101") public class EnterpriseBeanDefinitionTest extends AbstractJSR299Test { Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java 2010-02-20 23:52:09 UTC (rev 5909) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java 2010-02-21 00:06:35 UTC (rev 5910) @@ -1,26 +1,9 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc., 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.implementation.enterprise.definition; -import javax.ejb.Singleton; -import javax.enterprise.context.Dependent; +import javax.ejb.Local; -@Singleton -@Dependent -class Labrador +@Local +public interface Labrador { + } Copied: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/LabradorImpl.java (from rev 5907, cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java) =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/LabradorImpl.java (rev 0) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/LabradorImpl.java 2010-02-21 00:06:35 UTC (rev 5910) @@ -0,0 +1,26 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc., 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.implementation.enterprise.definition; + +import javax.ejb.Singleton; +import javax.enterprise.context.Dependent; + +@Singleton +@Dependent +class LabradorImpl implements Labrador +{ +} Property changes on: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/LabradorImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java 2010-02-20 23:52:09 UTC (rev 5909) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java 2010-02-21 00:06:35 UTC (rev 5910) @@ -1,34 +1,9 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc., 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.implementation.enterprise.definition; - -import javax.ejb.Remove; -import javax.ejb.Singleton; -import javax.enterprise.context.ApplicationScoped; - -@Singleton -@ApplicationScoped -class Laika -{ - - @Remove - public void remove() - { - - } - -} +package org.jboss.jsr299.tck.tests.implementation.enterprise.definition; + +import javax.ejb.Local; + +@Local +public interface Laika +{ + +} Copied: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/LaikaImpl.java (from rev 5907, cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java) =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/LaikaImpl.java (rev 0) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/LaikaImpl.java 2010-02-21 00:06:35 UTC (rev 5910) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc., 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.implementation.enterprise.definition; + +import javax.ejb.Remove; +import javax.ejb.Singleton; +import javax.enterprise.context.ApplicationScoped; + +@Singleton +@ApplicationScoped +class LaikaImpl implements Laika +{ + + @Remove + public void remove() + { + + } + +} Property changes on: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/LaikaImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ejb-jar.xml =================================================================== --- cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ejb-jar.xml 2010-02-20 23:52:09 UTC (rev 5909) +++ cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ejb-jar.xml 2010-02-21 00:06:35 UTC (rev 5910) @@ -3,8 +3,8 @@ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee - http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" - version="3.0"> + http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd" + version="3.1"> <description>JSR-299 Enterprise Bean Definition Test</description> <display-name>JSR-299 Enterprise Bean Definition Test</display-name> <enterprise-beans>