[jboss-cvs] JBossAS SVN: r89720 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/rar and 2 other directories.

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

Author: jeff.zhang
Date: 2009-06-03 05:44:13 -0400 (Wed, 03 Jun 2009)
New Revision: 89720

Added:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16DefaultNSMetaData.java
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testDefaultNS.xml
Modified:
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java
Log:
[JBMETA-198] default namespace parser, see TODO in RA16EverythingUnitTestCase

Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16DefaultNSMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16DefaultNSMetaData.java	                        (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16DefaultNSMetaData.java	2009-06-03 09:44:13 UTC (rev 89720)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.rar.spec;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * Connector default namespace meta data
+ *
+ * @author Jeff Zhang
+ * @version $Revision:$
+ */
+ at XmlRootElement(name="connector")
+ at JBossXmlSchema(
+      ignoreUnresolvedFieldOrClass=false,
+      elementFormDefault=XmlNsForm.QUALIFIED,
+      normalizeSpace=true,
+      strict=false)
+ at XmlType(name="connectorType", propOrder={"descriptionGroup", "vendorName", "EISType", "RAVersion", "license", "ra", "requiredWorkContexts"})
+public class JCA16DefaultNSMetaData extends ConnectorMetaData
+{
+   private static final long serialVersionUID = 7047130842344140262L;
+   
+   private boolean metadataComplete;
+   private List<String> requiredWorkContexts;
+   
+   
+   public boolean isMetadataComplete() 
+   {
+      return metadataComplete;
+   }
+   
+   @XmlAttribute(required=true)
+   public void setMetadataComplete(boolean metadataComplete) 
+   {
+      this.metadataComplete = metadataComplete;
+   }
+   
+   public List<String> getRequiredWorkContexts() 
+   {
+      return requiredWorkContexts;
+   }
+   
+   @XmlElement(name = "required-work-context")
+   public void setRequiredWorkContexts(List<String> requiredWorkContexts) 
+   {
+      this.requiredWorkContexts = requiredWorkContexts;
+   }
+}


Property changes on: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16DefaultNSMetaData.java
___________________________________________________________________
Name: svn:keywords
   + Id Reversion Date

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java	2009-06-03 09:41:27 UTC (rev 89719)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java	2009-06-03 09:44:13 UTC (rev 89720)
@@ -21,9 +21,9 @@
 */
 package org.jboss.test.metadata.rar;
 
-
 import org.jboss.metadata.rar.spec.ActivationspecMetaData;
 import org.jboss.metadata.rar.spec.JCA16MetaData;
+import org.jboss.metadata.rar.spec.JCA16DefaultNSMetaData;
 
 /**
  * Test ResourceAdapter ra.xml metadata.
@@ -60,6 +60,13 @@
       assertNull(connector.getRa().getAdminObjects());
       assertNull(connector.getRa().getSecurityPermissions());
    }
+
+   //TODO default namespace parser need to be passed
+   public void ignoretestDefaultNS() throws Exception
+   {
+      JCA16DefaultNSMetaData connector = unmarshal(JCA16DefaultNSMetaData.class);
+      assertNotNull(connector);
+   }
    
    protected JCA16MetaData unmarshal() throws Exception
    {

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java	2009-06-03 09:41:27 UTC (rev 89719)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java	2009-06-03 09:44:13 UTC (rev 89720)
@@ -80,6 +80,8 @@
       IGNORE.add("JBossClient5_test4915.xml");
       // dtd don't support prefix mapping (xmlns:prefix_name must declared attributes)
       IGNORE.add("JBoss42_testServiceRefQnameWithNS.xml");
+      // xml with default namespace
+      IGNORE.add("RA16Everything_testDefaultNS.xml");
    }
    
    private static final EntityResolver RESOLVER = new JBossEntityResolver()

Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testDefaultNS.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testDefaultNS.xml	                        (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testDefaultNS.xml	2009-06-03 09:44:13 UTC (rev 89720)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id$ -->
+
+<connector>
+
+   <vendor-name>Red Hat Middleware LLC</vendor-name>
+   <eis-type>JMS 1.1 Server</eis-type>
+   <resourceadapter-version>6.0</resourceadapter-version>
+
+   <resourceadapter>
+   </resourceadapter>
+</connector>


Property changes on: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testDefaultNS.xml
___________________________________________________________________
Name: svn:keywords
   + Id Reversion Date