[weld-commits] Weld SVN: r6303 - in cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary: libraryBeans and 1 other directory.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Tue May 25 08:09:36 EDT 2010
Author: pete.muir at jboss.org
Date: 2010-05-25 08:09:35 -0400 (Tue, 25 May 2010)
New Revision: 6303
Added:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/libraryBeans/
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/libraryBeans/Bar.java
Removed:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Bar.java
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java
Log:
Better fix for CDITCK-150
Deleted: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Bar.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Bar.java 2010-05-25 11:31:33 UTC (rev 6302)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Bar.java 2010-05-25 12:09:35 UTC (rev 6303)
@@ -1,26 +0,0 @@
-/*
- * 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.deployment.packaging.bundledLibrary;
-
-/**
- * @author pmuir
- *
- */
-public class Bar
-{
-
-}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java 2010-05-25 11:31:33 UTC (rev 6302)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java 2010-05-25 12:09:35 UTC (rev 6303)
@@ -18,14 +18,15 @@
package org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary;
import java.io.IOException;
+import java.util.Arrays;
import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary.libraryBeans.Bar;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ArtifactDescriptor;
-import org.jboss.testharness.impl.packaging.Classes;
import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
@@ -39,9 +40,7 @@
*
* @author David Allen
*/
- at Artifact(addCurrentPackage=false)
-// We put Foo in the ejb jar, but Bar goes in the library
- at Classes({LibraryInEarTest.class, Foo.class, Baz.class, BazLocal.class})
+ at Artifact
@Test
@SpecVersion(spec="cdi", version="20091101")
@IntegrationTest
@@ -54,7 +53,7 @@
{
super.postCreate(artifact);
ArtifactDescriptor library = new ArtifactDescriptor(LibraryInEarTest.class);
- library.getClasses().add(Bar.class);
+ library.getClasses().addAll(Arrays.asList(Bar.class));
library.getResources().add(new ResourceDescriptorImpl(JSR299ArtifactDescriptor.BEANS_XML_DESTINATION, JSR299ArtifactDescriptor.STANDARD_BEANS_XML_FILE_NAME));
artifact.getLibraries().add(new ResourceDescriptorImpl("cdi-tck-beans.jar", library.getJarAsStream()));
return artifact;
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java 2010-05-25 11:31:33 UTC (rev 6302)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java 2010-05-25 12:09:35 UTC (rev 6303)
@@ -20,6 +20,7 @@
import java.io.IOException;
import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary.libraryBeans.Bar;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java 2010-05-25 11:31:33 UTC (rev 6302)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java 2010-05-25 12:09:35 UTC (rev 6303)
@@ -20,6 +20,7 @@
import java.io.IOException;
import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary.libraryBeans.Bar;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
Copied: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/libraryBeans/Bar.java (from rev 6300, cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Bar.java)
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/libraryBeans/Bar.java (rev 0)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/libraryBeans/Bar.java 2010-05-25 12:09:35 UTC (rev 6303)
@@ -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.deployment.packaging.bundledLibrary.libraryBeans;
+
+/**
+ * @author pmuir
+ *
+ */
+public class Bar
+{
+
+}
More information about the weld-commits
mailing list