[jboss-cvs] JBossAS SVN: r89782 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/rar/spec and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 3 23:43:22 EDT 2009
Author: jeff.zhang
Date: 2009-06-03 23:43:22 -0400 (Wed, 03 Jun 2009)
New Revision: 89782
Added:
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRADefaultNSMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA15DefaultNSMetaData.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA10DefaultNSUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA15DefaultNSUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16DefaultNSUnitTestCase.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JbossRA10DefaultNS_testBasic.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA15DefaultNS_testDefaultNS.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16DefaultNS_testDefaultNS.xml
Removed:
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testDefaultNS.xml
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA15MetaData.java
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] [JBMETA-199] Default namespace for connector and jboss-ra
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRADefaultNSMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRADefaultNSMetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRADefaultNSMetaData.java 2009-06-04 03:43:22 UTC (rev 89782)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.jboss;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.metadata.javaee.support.IdMetaDataImpl;
+
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * A JBossRAMetaData.
+ *
+ * @author Jeff Zhang
+ * @version $Revision$
+ */
+ at XmlRootElement(name="jboss-ra")
+ at JBossXmlSchema(
+ ignoreUnresolvedFieldOrClass=false,
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true,
+ strict=false)
+public class JBossRADefaultNSMetaData extends IdMetaDataImpl
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = -8041048198795930659L;
+
+ private List<RaConfigPropertyMetaData> raConfigProps;
+
+ @XmlElement(name="ra-config-property")
+ public void setRaConfigProps(List<RaConfigPropertyMetaData> raConfigProps) {
+ this.raConfigProps = raConfigProps;
+ }
+
+ public List<RaConfigPropertyMetaData> getRaConfigProps() {
+ return raConfigProps;
+ }
+
+
+}
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA15DefaultNSMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA15DefaultNSMetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA15DefaultNSMetaData.java 2009-06-04 03:43:22 UTC (rev 89782)
@@ -0,0 +1,52 @@
+/*
+ * 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"})
+public class JCA15DefaultNSMetaData extends ConnectorMetaData
+{
+ private static final long serialVersionUID = 7047138842344140262L;
+}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA15MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA15MetaData.java 2009-06-04 03:21:28 UTC (rev 89781)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA15MetaData.java 2009-06-04 03:43:22 UTC (rev 89782)
@@ -43,6 +43,6 @@
elementFormDefault=XmlNsForm.QUALIFIED,
normalizeSpace=true)
@XmlType(name="connectorType", propOrder={"descriptionGroup", "vendorName", "EISType", "RAVersion", "license", "ra"})
- public class JCA15MetaData extends ConnectorMetaData {
+public class JCA15MetaData extends ConnectorMetaData {
private static final long serialVersionUID = 7047132542344140262L;
}
Added: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA10DefaultNSUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA10DefaultNSUnitTestCase.java (rev 0)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA10DefaultNSUnitTestCase.java 2009-06-04 03:43:22 UTC (rev 89782)
@@ -0,0 +1,57 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.metadata.rar;
+
+import org.jboss.metadata.rar.jboss.JBossRADefaultNSMetaData;
+import org.jboss.metadata.rar.spec.JCA16DefaultNSMetaData;
+import org.jboss.test.metadata.common.MetaDataSchemaResolverFactory;
+import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+
+import org.jboss.xb.binding.resolver.MutableSchemaResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+
+/**
+ * Test JCA jboss-ra.xml metadata with default namespace
+ *
+ * @author Jeff Zhang
+ * @version $Revision:$
+ */
+public class JbossRA10DefaultNSUnitTestCase extends AbstractJavaEEMetaDataTest
+{
+ public static SchemaBindingResolver initResolver()
+ {
+ MutableSchemaResolver resolver = MetaDataSchemaResolverFactory.createSchemaResolver();
+ resolver.mapLocationToClass("jboss-ra", JBossRADefaultNSMetaData.class);
+ return resolver;
+ }
+
+ public JbossRA10DefaultNSUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testBasic() throws Exception
+ {
+ JBossRADefaultNSMetaData jbossRA = unmarshal(JBossRADefaultNSMetaData.class);
+ assertNotNull(jbossRA);
+ }
+}
Added: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA15DefaultNSUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA15DefaultNSUnitTestCase.java (rev 0)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA15DefaultNSUnitTestCase.java 2009-06-04 03:43:22 UTC (rev 89782)
@@ -0,0 +1,55 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.metadata.rar;
+
+import org.jboss.metadata.rar.spec.JCA15DefaultNSMetaData;
+import org.jboss.test.metadata.common.MetaDataSchemaResolverFactory;
+import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+import org.jboss.xb.binding.resolver.MutableSchemaResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+
+/**
+ * Test ResourceAdapter ra.xml metadata with default nameworkspace
+ *
+ * @author Jeff Zhang
+ * @version $Revision: $
+ */
+public class RA15DefaultNSUnitTestCase extends AbstractJavaEEMetaDataTest
+{
+ public static SchemaBindingResolver initResolver()
+ {
+ MutableSchemaResolver resolver = MetaDataSchemaResolverFactory.createSchemaResolver();
+ resolver.mapLocationToClass("connector", JCA15DefaultNSMetaData.class);
+ return resolver;
+ }
+
+ public RA15DefaultNSUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testDefaultNS() throws Exception
+ {
+ JCA15DefaultNSMetaData connector = unmarshal(JCA15DefaultNSMetaData.class);
+ assertNotNull(connector);
+ }
+}
Added: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16DefaultNSUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16DefaultNSUnitTestCase.java (rev 0)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16DefaultNSUnitTestCase.java 2009-06-04 03:43:22 UTC (rev 89782)
@@ -0,0 +1,55 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.metadata.rar;
+
+import org.jboss.metadata.rar.spec.JCA16DefaultNSMetaData;
+import org.jboss.test.metadata.common.MetaDataSchemaResolverFactory;
+import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+import org.jboss.xb.binding.resolver.MutableSchemaResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+
+/**
+ * Test ResourceAdapter ra.xml metadata with default nameworkspace
+ *
+ * @author Jeff Zhang
+ * @version $Revision: $
+ */
+public class RA16DefaultNSUnitTestCase extends AbstractJavaEEMetaDataTest
+{
+ public static SchemaBindingResolver initResolver()
+ {
+ MutableSchemaResolver resolver = MetaDataSchemaResolverFactory.createSchemaResolver();
+ resolver.mapLocationToClass("connector", JCA16DefaultNSMetaData.class);
+ return resolver;
+ }
+
+ public RA16DefaultNSUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testDefaultNS() throws Exception
+ {
+ JCA16DefaultNSMetaData connector = unmarshal(JCA16DefaultNSMetaData.class);
+ assertNotNull(connector);
+ }
+}
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-04 03:21:28 UTC (rev 89781)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java 2009-06-04 03:43:22 UTC (rev 89782)
@@ -23,7 +23,6 @@
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,13 +59,6 @@
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
{
@@ -82,11 +74,13 @@
assertEquals(connector.getRequiredWorkContexts().size(), 2);
assertEquals(connector.getRequiredWorkContexts().get(0), "java.work.Context1");
}
+
@Override
protected String getRAVersion()
{
return "6.0";
}
+
@Override
protected void assertConfigPropsInAS(ActivationspecMetaData as)
{
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-04 03:21:28 UTC (rev 89781)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java 2009-06-04 03:43:22 UTC (rev 89782)
@@ -81,7 +81,10 @@
// 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");
+ IGNORE.add("RA15DefaultNS_testDefaultNS.xml");
+ IGNORE.add("RA16DefaultNS_testDefaultNS.xml");
+ IGNORE.add("JbossRA10DefaultNS_testBasic.xml");
+
}
private static final EntityResolver RESOLVER = new JBossEntityResolver()
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JbossRA10DefaultNS_testBasic.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JbossRA10DefaultNS_testBasic.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JbossRA10DefaultNS_testBasic.xml 2009-06-04 03:43:22 UTC (rev 89782)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-ra>
+ <ra-config-property>
+ <ra-config-property-name>StringRAR</ra-config-property-name>
+ <ra-config-property-type>java.lang.String</ra-config-property-type>
+ <ra-config-property-value>XMLOVERRIDE</ra-config-property-value>
+ </ra-config-property>
+</jboss-ra>
\ No newline at end of file
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA15DefaultNS_testDefaultNS.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA15DefaultNS_testDefaultNS.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA15DefaultNS_testDefaultNS.xml 2009-06-04 03:43:22 UTC (rev 89782)
@@ -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>1.5</resourceadapter-version>
+
+ <resourceadapter>
+ </resourceadapter>
+</connector>
Copied: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16DefaultNS_testDefaultNS.xml (from rev 89776, 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/RA16DefaultNS_testDefaultNS.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16DefaultNS_testDefaultNS.xml 2009-06-04 03:43:22 UTC (rev 89782)
@@ -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>
Deleted: 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 2009-06-04 03:21:28 UTC (rev 89781)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testDefaultNS.xml 2009-06-04 03:43:22 UTC (rev 89782)
@@ -1,13 +0,0 @@
-<?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>
More information about the jboss-cvs-commits
mailing list