[jboss-svn-commits] JBL Code SVN: r10891 - in labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin: src/main/resources/org/jboss/maven/plugins/deploy and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: pgier
Date: 2007-04-11 12:55:43 -0400 (Wed, 11 Apr 2007)
New Revision: 10891

Modified:
   labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/
   labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/src/main/resources/org/jboss/maven/plugins/deploy/component-info-template.txt
   labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/src/main/resources/org/jboss/maven/plugins/deploy/component-info.xsd
   labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/src/test/java/org/jboss/test/maven/plugins/deploy/CompInfoVerifierTestCase.java
Log:
Added full xsd URL to component info template.
Added info to unit test.
Correction to import tag definition in xsd.


Property changes on: labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin
___________________________________________________________________
Name: svn:ignore
   - .classpath
.project
target

   + .classpath
.project
target
.settings


Modified: labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/src/main/resources/org/jboss/maven/plugins/deploy/component-info-template.txt
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/src/main/resources/org/jboss/maven/plugins/deploy/component-info-template.txt	2007-04-11 15:51:19 UTC (rev 10890)
+++ labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/src/main/resources/org/jboss/maven/plugins/deploy/component-info-template.txt	2007-04-11 16:55:43 UTC (rev 10891)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://www.jboss.org/component-info/1.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.jboss.org/component-info/1.0 component-info.xsd"
+  xsi:schemaLocation="http://www.jboss.org/component-info/1.0 http://repository.jboss.org/component-info-v1_0.xsd"
   name="${project.name}">
   <component id="${component.id}"
              licenseType="${project.license}"

Modified: labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/src/main/resources/org/jboss/maven/plugins/deploy/component-info.xsd
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/src/main/resources/org/jboss/maven/plugins/deploy/component-info.xsd	2007-04-11 15:51:19 UTC (rev 10890)
+++ labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/src/main/resources/org/jboss/maven/plugins/deploy/component-info.xsd	2007-04-11 16:55:43 UTC (rev 10891)
@@ -53,7 +53,7 @@
         </xs:complexType>
       </xs:element>
     </xs:sequence>
-    <xs:attribute name="componentref" type="xs:string"/>        
+    <xs:attribute name="componentref" type="xs:string" use="required"/>        
   </xs:complexType>
   
 </xs:schema>

Modified: labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/src/test/java/org/jboss/test/maven/plugins/deploy/CompInfoVerifierTestCase.java
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/src/test/java/org/jboss/test/maven/plugins/deploy/CompInfoVerifierTestCase.java	2007-04-11 15:51:19 UTC (rev 10890)
+++ labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/src/test/java/org/jboss/test/maven/plugins/deploy/CompInfoVerifierTestCase.java	2007-04-11 16:55:43 UTC (rev 10891)
@@ -7,6 +7,7 @@
 package org.jboss.test.maven.plugins.deploy;
 
 import java.io.InputStream;
+import java.util.logging.Logger;
 
 import junit.framework.TestCase;
 
@@ -16,6 +17,8 @@
 public class CompInfoVerifierTestCase extends TestCase
 {
 
+   private static Logger logger = Logger.getLogger("org.jboss.test.maven.plugins.deploy");
+   
    protected void setUp() throws Exception
    {
       super.setUp();
@@ -48,6 +51,7 @@
       CompInfoVerifier verifier = new CompInfoVerifier();
       InputStream is = this.getClass().getResourceAsStream("component-info-test-bad.xml_test");
       try {
+         logger.info("XML verification error should happen here:");
          verifier.verifyCompInfo(is);
       } catch (SAXException e) {
          result= true;