[webbeans-commits] Webbeans SVN: r1724 - examples/trunk/numberguess/WebContent/WEB-INF and 6 other directories.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-02-26 15:13:57 -0500 (Thu, 26 Feb 2009)
New Revision: 1724

Added:
   examples/trunk/login/WebContent/WEB-INF/beans.xml
   examples/trunk/numberguess/WebContent/WEB-INF/beans.xml
   examples/trunk/translator/webbeans-translator-ejb/src/main/resources/META-INF/beans.xml
Removed:
   examples/trunk/login/WebContent/WEB-INF/web-beans.xml
   examples/trunk/numberguess/WebContent/WEB-INF/web-beans.xml
   examples/trunk/translator/webbeans-translator-ejb/src/main/resources/META-INF/web-beans.xml
Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/JSR299ArtifactDescriptor.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java
   tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/AbstractArtifactTest.java
   tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/EarArtifactTest.java
   tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/WarArtifactTest.java
Log:
WBRI-128

Copied: examples/trunk/login/WebContent/WEB-INF/beans.xml (from rev 1425, examples/trunk/login/WebContent/WEB-INF/web-beans.xml)
===================================================================

Deleted: examples/trunk/login/WebContent/WEB-INF/web-beans.xml
===================================================================

Copied: examples/trunk/numberguess/WebContent/WEB-INF/beans.xml (from rev 1425, examples/trunk/numberguess/WebContent/WEB-INF/web-beans.xml)
===================================================================


Property changes on: examples/trunk/numberguess/WebContent/WEB-INF/beans.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Deleted: examples/trunk/numberguess/WebContent/WEB-INF/web-beans.xml
===================================================================

Copied: examples/trunk/translator/webbeans-translator-ejb/src/main/resources/META-INF/beans.xml (from rev 1425, examples/trunk/translator/webbeans-translator-ejb/src/main/resources/META-INF/web-beans.xml)
===================================================================

Deleted: examples/trunk/translator/webbeans-translator-ejb/src/main/resources/META-INF/web-beans.xml
===================================================================

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/JSR299ArtifactDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/JSR299ArtifactDescriptor.java	2009-02-26 19:16:58 UTC (rev 1723)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/JSR299ArtifactDescriptor.java	2009-02-26 20:13:57 UTC (rev 1724)
@@ -8,7 +8,7 @@
 public class JSR299ArtifactDescriptor extends ArtifactDescriptor
 {
    
-   public static final String BEANS_XML_DESTINATION = "META-INF/web-beans.xml";
+   public static final String BEANS_XML_DESTINATION = "META-INF/beans.xml";
    public static final String STANDARD_BEANS_XML_FILE_NAME = "org/jboss/jsr299/tck/impl/packaging/jsr299/default/beans.xml";
    
    private final ResourceDescriptor beansXml;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java	2009-02-26 19:16:58 UTC (rev 1723)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java	2009-02-26 20:13:57 UTC (rev 1724)
@@ -57,6 +57,6 @@
    @Override
    public String getBeansDestination()
    {
-      return "WEB-INF/web-beans.xml";
+      return "WEB-INF/beans.xml";
    }
 }

Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/AbstractArtifactTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/AbstractArtifactTest.java	2009-02-26 19:16:58 UTC (rev 1723)
+++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/AbstractArtifactTest.java	2009-02-26 20:13:57 UTC (rev 1724)
@@ -44,7 +44,7 @@
       
      public boolean accept(File dir, String name)
       {
-         return name.equals("web-beans.xml");
+         return name.equals("beans.xml");
       } 
       
    };

Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/EarArtifactTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/EarArtifactTest.java	2009-02-26 19:16:58 UTC (rev 1723)
+++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/EarArtifactTest.java	2009-02-26 20:13:57 UTC (rev 1724)
@@ -38,7 +38,7 @@
       assert webXml.isFile();
       assert webXml.getName().equals("web.xml");
       assert webXml.length() != 0;
-      assert !new File(webInf, "web-beans.xml").exists();
+      assert !new File(webInf, "beans.xml").exists();
       
       File webInfLib = new File(webInf, "lib");
       assert !webInfLib.exists();
@@ -81,7 +81,7 @@
       assert ejbJarXml.isFile();
       assert ejbJarXml.length() > 0;
       
-      File webbeansXml = new File(ejbJarRoot, "META-INF/web-beans.xml");
+      File webbeansXml = new File(ejbJarRoot, "META-INF/beans.xml");
       assert webbeansXml.isFile();
       assert webbeansXml.length() == 0;
       
@@ -146,7 +146,7 @@
       }
       is.close();
       assert fileNames.contains("META-INF/ejb-jar.xml");
-      assert fileNames.contains("META-INF/web-beans.xml");
+      assert fileNames.contains("META-INF/beans.xml");
       assert fileNames.contains("org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/Cow.class");
    }
 

Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/WarArtifactTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/WarArtifactTest.java	2009-02-26 19:16:58 UTC (rev 1723)
+++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/WarArtifactTest.java	2009-02-26 20:13:57 UTC (rev 1724)
@@ -35,7 +35,7 @@
       assert webXml.length() != 0;
       File beansXml = webInf.listFiles(BEANS_XML_FILTER)[0];
       assert beansXml.isFile();
-      assert beansXml.getName().equals("web-beans.xml");
+      assert beansXml.getName().equals("beans.xml");
       assert beansXml.length() == 0;
       File currentPackage = getCurrentPackageAsFile(root);
       File[] cowClasses = currentPackage.listFiles(new FilenameFilter()
@@ -83,7 +83,7 @@
          fileNames.add(entry.getName().replace(File.separator, "/"));
       }
       is.close();
-      assert fileNames.contains("WEB-INF/web-beans.xml");
+      assert fileNames.contains("WEB-INF/beans.xml");
       assert fileNames.contains("WEB-INF/web.xml");
       assert fileNames.contains("WEB-INF/classes/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/Cow.class");
       assert fileNames.contains("WEB-INF/lib/tck-support.jar");