[jboss-cvs] JBossAS SVN: r66198 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/client/spec and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 16 23:53:29 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-16 23:53:29 -0400 (Tue, 16 Oct 2007)
New Revision: 66198
Added:
projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5DTDMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14DTDMetaData.java
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironment.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/IdMetaDataImplWithOverride.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/JBossClient5EverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml
Log:
Add service-ref to remote env group
Introduce common JBossClientMetaData base class
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5DTDMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5DTDMetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5DTDMetaData.java 2007-10-17 03:53:29 UTC (rev 66198)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, 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.metadata.client.jboss;
+
+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;
+
+/**
+ * JBoss specific meta data for JavaEE 5 clients that does not
+ * use a namespace.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: $
+ */
+ at XmlRootElement(name="jboss-client", namespace="")
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
+ ignoreUnresolvedFieldOrClass=false,
+ namespace="",
+ elementFormDefault=XmlNsForm.UNSET)
+ at XmlType(name="jboss-clientType", namespace="")
+public class JBossClient5DTDMetaData extends JBossClientMetaData
+{
+ private static final long serialVersionUID = 1L;
+}
Property changes on: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5DTDMetaData.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5MetaData.java 2007-10-17 03:43:12 UTC (rev 66197)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5MetaData.java 2007-10-17 03:53:29 UTC (rev 66198)
@@ -21,34 +21,12 @@
*/
package org.jboss.metadata.client.jboss;
-import java.util.List;
-
import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.jboss.metadata.client.spec.ApplicationClient5MetaData;
-import org.jboss.metadata.javaee.jboss.JBossRemoteEnvironmentRefsGroupMetaData;
-import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
-import org.jboss.metadata.javaee.spec.EJBReferencesMetaData;
-import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
-import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
-import org.jboss.metadata.javaee.spec.PersistenceUnitReferenceMetaData;
-import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
-import org.jboss.metadata.javaee.spec.RemoteEnvironment;
-import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
-import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
-import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
-import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
-import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroupWithOverride;
-import org.jboss.metadata.javaee.support.JavaEEMetaDataUtil;
import org.jboss.xb.annotations.JBossXmlSchema;
/**
@@ -64,155 +42,7 @@
namespace=JavaEEMetaDataConstants.JBOSS_NS,
elementFormDefault=XmlNsForm.QUALIFIED)
@XmlType(name="jboss-clientType", namespace=JavaEEMetaDataConstants.JBOSS_NS)
-public class JBossClient5MetaData extends IdMetaDataImplWithDescriptionGroupWithOverride<ApplicationClient5MetaData> implements RemoteEnvironment
+public class JBossClient5MetaData extends JBossClientMetaData
{
- private static final long serialVersionUID = 1L;
-
- /** The jndi name for the client environment */
- private String jndiName;
-
- /** The environment */
- private JBossRemoteEnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup;
-
- /** The merged environment */
- private transient JBossRemoteEnvironmentRefsGroupMetaData mergedEnvironment;
-
- /** A list of extra dependencies to wait on */
- private List<String> depends;
-
- private transient MessageDestinationsMetaData mergedMessageDestinations;
-
- public String getCallbackHandler()
- {
- return getOverridenMetaDataWithCheck().getCallbackHandler();
- }
-
- public List<String> getDepends()
- {
- return depends;
- }
-
- public JBossRemoteEnvironmentRefsGroupMetaData getJBossJndiEnvironmentRefsGroup()
- {
- return jndiEnvironmentRefsGroup;
- }
-
- public String getJndiName()
- {
- return jndiName;
- }
-
- /**
- * Get the mergedEnvironment.
- *
- * @return the mergedEnvironment.
- */
- @XmlTransient
- public JBossRemoteEnvironmentRefsGroupMetaData getMergedEnvironment()
- {
- if (mergedEnvironment != null)
- return mergedEnvironment;
-
- mergedEnvironment = JBossRemoteEnvironmentRefsGroupMetaData.merge(jndiEnvironmentRefsGroup, getOverridenMetaDataWithCheck(), "application-client.xml", "jboss-client.xml");
- return mergedEnvironment;
- }
-
- public void setDepends(List<String> depends)
- {
- this.depends = depends;
- }
-
- public void setJBossJndiEnvironmentRefsGroup(JBossRemoteEnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup)
- {
- if(jndiEnvironmentRefsGroup == null)
- throw new IllegalArgumentException("jndiEnvironmentRefsGroup is null");
- this.jndiEnvironmentRefsGroup = jndiEnvironmentRefsGroup;
- }
-
- public void setJndiName(String jndiName)
- {
- this.jndiName = jndiName;
- }
-
- // MERGED
-
- public EJBReferenceMetaData getEjbReferenceByName(String name)
- {
- return getMergedEnvironment().getEjbReferenceByName(name);
- }
-
- public EJBReferencesMetaData getEjbReferences()
- {
- return getMergedEnvironment().getEjbReferences();
- }
-
- public EnvironmentEntriesMetaData getEnvironmentEntries()
- {
- return getMergedEnvironment().getEnvironmentEntries();
- }
-
- public EnvironmentEntryMetaData getEnvironmentEntryByName(String name)
- {
- return getMergedEnvironment().getEnvironmentEntryByName(name);
- }
-
- public MessageDestinationReferenceMetaData getMessageDestinationReferenceByName(String name)
- {
- return getMergedEnvironment().getMessageDestinationReferenceByName(name);
- }
-
- public MessageDestinationReferencesMetaData getMessageDestinationReferences()
- {
- return getMergedEnvironment().getMessageDestinationReferences();
- }
-
- public MessageDestinationsMetaData getMergedMessageDestinations()
- {
- if(mergedMessageDestinations != null)
- return mergedMessageDestinations;
-
- mergedMessageDestinations = new MessageDestinationsMetaData();
- mergedMessageDestinations = JavaEEMetaDataUtil.merge(mergedMessageDestinations, getOverridenMetaDataWithCheck().getMessageDestinations(), null, "message-destination", "application-client.xml", "jboss-client.xml", true);
- return mergedMessageDestinations;
- }
-
- public PersistenceUnitReferenceMetaData getPersistenceUnitReferenceByName(String name)
- {
- return getMergedEnvironment().getPersistenceUnitReferenceByName(name);
- }
-
- public PersistenceUnitReferencesMetaData getPersistenceUnitRefs()
- {
- return getMergedEnvironment().getPersistenceUnitRefs();
- }
-
- public LifecycleCallbacksMetaData getPostConstructs()
- {
- return getMergedEnvironment().getPostConstructs();
- }
-
- public LifecycleCallbacksMetaData getPreDestroys()
- {
- return getMergedEnvironment().getPreDestroys();
- }
-
- public ResourceEnvironmentReferenceMetaData getResourceEnvironmentReferenceByName(String name)
- {
- return getMergedEnvironment().getResourceEnvironmentReferenceByName(name);
- }
-
- public ResourceEnvironmentReferencesMetaData getResourceEnvironmentReferences()
- {
- return getMergedEnvironment().getResourceEnvironmentReferences();
- }
-
- public ResourceReferenceMetaData getResourceReferenceByName(String name)
- {
- return getMergedEnvironment().getResourceReferenceByName(name);
- }
-
- public ResourceReferencesMetaData getResourceReferences()
- {
- return getMergedEnvironment().getResourceReferences();
- }
-}
+ private static final long serialVersionUID = 1;
+}
\ No newline at end of file
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java 2007-10-17 03:53:29 UTC (rev 66198)
@@ -0,0 +1,216 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * 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.metadata.client.jboss;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlTransient;
+
+import org.jboss.metadata.client.spec.ApplicationClientMetaData;
+import org.jboss.metadata.javaee.jboss.JBossRemoteEnvironmentRefsGroupMetaData;
+import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
+import org.jboss.metadata.javaee.spec.EJBReferencesMetaData;
+import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
+import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
+import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceUnitReferenceMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
+import org.jboss.metadata.javaee.spec.RemoteEnvironment;
+import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
+import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
+import org.jboss.metadata.javaee.support.IdMetaDataImplWithOverride;
+import org.jboss.metadata.javaee.support.JavaEEMetaDataUtil;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class JBossClientMetaData extends IdMetaDataImplWithOverride<ApplicationClientMetaData>
+ implements RemoteEnvironment
+{
+ private static final long serialVersionUID = 1L;
+
+ /** The jndi name for the client environment */
+ private String jndiName;
+
+ /** The environment */
+ private JBossRemoteEnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup;
+
+ /** The merged environment */
+ private transient JBossRemoteEnvironmentRefsGroupMetaData mergedEnvironment;
+
+ /** A list of extra dependencies to wait on */
+ private List<String> depends;
+
+ private transient MessageDestinationsMetaData mergedMessageDestinations;
+
+ public String getCallbackHandler()
+ {
+ return getOverridenMetaDataWithCheck().getCallbackHandler();
+ }
+
+ public List<String> getDepends()
+ {
+ return depends;
+ }
+
+ public JBossRemoteEnvironmentRefsGroupMetaData getJBossJndiEnvironmentRefsGroup()
+ {
+ return jndiEnvironmentRefsGroup;
+ }
+
+ public String getJndiName()
+ {
+ return jndiName;
+ }
+
+ /**
+ * Get the mergedEnvironment.
+ *
+ * @return the mergedEnvironment.
+ */
+ @XmlTransient
+ public JBossRemoteEnvironmentRefsGroupMetaData getMergedEnvironment()
+ {
+ if (mergedEnvironment != null)
+ return mergedEnvironment;
+
+ mergedEnvironment = JBossRemoteEnvironmentRefsGroupMetaData.merge(jndiEnvironmentRefsGroup, getOverridenMetaDataWithCheck(), "application-client.xml", "jboss-client.xml");
+ return mergedEnvironment;
+ }
+
+ public void setDepends(List<String> depends)
+ {
+ this.depends = depends;
+ }
+
+ public void setJBossJndiEnvironmentRefsGroup(JBossRemoteEnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup)
+ {
+ if(jndiEnvironmentRefsGroup == null)
+ throw new IllegalArgumentException("jndiEnvironmentRefsGroup is null");
+ this.jndiEnvironmentRefsGroup = jndiEnvironmentRefsGroup;
+ }
+
+ public void setJndiName(String jndiName)
+ {
+ this.jndiName = jndiName;
+ }
+
+ // MERGED
+
+ public EJBReferenceMetaData getEjbReferenceByName(String name)
+ {
+ return getMergedEnvironment().getEjbReferenceByName(name);
+ }
+
+ public EJBReferencesMetaData getEjbReferences()
+ {
+ return getMergedEnvironment().getEjbReferences();
+ }
+
+ public EnvironmentEntriesMetaData getEnvironmentEntries()
+ {
+ return getMergedEnvironment().getEnvironmentEntries();
+ }
+
+ public EnvironmentEntryMetaData getEnvironmentEntryByName(String name)
+ {
+ return getMergedEnvironment().getEnvironmentEntryByName(name);
+ }
+
+ public MessageDestinationReferenceMetaData getMessageDestinationReferenceByName(String name)
+ {
+ return getMergedEnvironment().getMessageDestinationReferenceByName(name);
+ }
+
+ public MessageDestinationReferencesMetaData getMessageDestinationReferences()
+ {
+ return getMergedEnvironment().getMessageDestinationReferences();
+ }
+
+ public MessageDestinationsMetaData getMergedMessageDestinations()
+ {
+ if(mergedMessageDestinations != null)
+ return mergedMessageDestinations;
+
+ mergedMessageDestinations = new MessageDestinationsMetaData();
+ mergedMessageDestinations = JavaEEMetaDataUtil.merge(mergedMessageDestinations, getOverridenMetaDataWithCheck().getMessageDestinations(), null, "message-destination", "application-client.xml", "jboss-client.xml", true);
+ return mergedMessageDestinations;
+ }
+
+ public PersistenceUnitReferenceMetaData getPersistenceUnitReferenceByName(String name)
+ {
+ return getMergedEnvironment().getPersistenceUnitReferenceByName(name);
+ }
+
+ public PersistenceUnitReferencesMetaData getPersistenceUnitRefs()
+ {
+ return getMergedEnvironment().getPersistenceUnitRefs();
+ }
+
+ public LifecycleCallbacksMetaData getPostConstructs()
+ {
+ return getMergedEnvironment().getPostConstructs();
+ }
+
+ public LifecycleCallbacksMetaData getPreDestroys()
+ {
+ return getMergedEnvironment().getPreDestroys();
+ }
+
+ public ServiceReferenceMetaData getServiceReferenceByName(String name)
+ {
+ return getMergedEnvironment().getServiceReferenceByName(name);
+ }
+
+ public ServiceReferencesMetaData getServiceReferences()
+ {
+ return getMergedEnvironment().getServiceReferences();
+ }
+
+ public ResourceEnvironmentReferenceMetaData getResourceEnvironmentReferenceByName(String name)
+ {
+ return getMergedEnvironment().getResourceEnvironmentReferenceByName(name);
+ }
+
+ public ResourceEnvironmentReferencesMetaData getResourceEnvironmentReferences()
+ {
+ return getMergedEnvironment().getResourceEnvironmentReferences();
+ }
+
+ public ResourceReferenceMetaData getResourceReferenceByName(String name)
+ {
+ return getMergedEnvironment().getResourceReferenceByName(name);
+ }
+
+ public ResourceReferencesMetaData getResourceReferences()
+ {
+ return getMergedEnvironment().getResourceReferences();
+ }
+}
Property changes on: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14DTDMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14DTDMetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14DTDMetaData.java 2007-10-17 03:53:29 UTC (rev 66198)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, 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.metadata.client.spec;
+
+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;
+
+/**
+ * The application client meta data for J2EE 1.4 clients that
+ * does not use a namespace.
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: $
+ */
+ at XmlRootElement(name="application-client", namespace="")
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
+ ignoreUnresolvedFieldOrClass=false,
+ namespace="",
+ elementFormDefault=XmlNsForm.UNSET)
+ at XmlType(name="application-clientType",
+ namespace=JavaEEMetaDataConstants.J2EE_NS)
+public class ApplicationClient14DTDMetaData extends ApplicationClientMetaData
+{
+ private static final long serialVersionUID = 1L;
+
+}
Property changes on: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14DTDMetaData.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java 2007-10-17 03:43:12 UTC (rev 66197)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java 2007-10-17 03:53:29 UTC (rev 66198)
@@ -41,6 +41,8 @@
import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
@@ -201,6 +203,17 @@
return null;
}
+ public ServiceReferenceMetaData getServiceReferenceByName(String name)
+ {
+ return AbstractMappedMetaData.getByName(name, getServiceReferences());
+ }
+ public ServiceReferencesMetaData getServiceReferences()
+ {
+ if (jndiEnvironmentRefsGroup != null)
+ return jndiEnvironmentRefsGroup.getServiceReferences();
+ return null;
+ }
+
public ResourceReferenceMetaData getResourceReferenceByName(String name)
{
return AbstractMappedMetaData.getByName(name, getResourceReferences());
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironment.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironment.java 2007-10-17 03:43:12 UTC (rev 66197)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironment.java 2007-10-17 03:53:29 UTC (rev 66198)
@@ -63,6 +63,21 @@
EJBReferenceMetaData getEjbReferenceByName(String name);
/**
+ * Get the service references
+ * @return
+ */
+ ServiceReferencesMetaData getServiceReferences();
+
+ /**
+ * Get by name
+ *
+ * @param name the name
+ * @return the result or null if not found
+ * @throws IllegalArgumentException for a null name
+ */
+ ServiceReferenceMetaData getServiceReferenceByName(String name);
+
+ /**
* Get the resourceReferences.
*
* @return the resourceReferences.
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java 2007-10-17 03:43:12 UTC (rev 66197)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java 2007-10-17 03:53:29 UTC (rev 66198)
@@ -39,6 +39,7 @@
propOrder={
"environmentEntries",
"ejbReferences",
+ "serviceReferences",
"resourceReferences",
"resourceEnvironmentReferences",
"messageDestinationReferences",
@@ -56,6 +57,9 @@
/** The ejb references */
private EJBReferencesMetaData ejbReferences;
+ /** The service references */
+ private ServiceReferencesMetaData serviceReferences;
+
/** The resource references */
private ResourceReferencesMetaData resourceReferences;
@@ -130,6 +134,16 @@
this.ejbReferences = ejbReferences;
}
+ public ServiceReferencesMetaData getServiceReferences()
+ {
+ return serviceReferences;
+ }
+ @XmlElement(name="service-ref")
+ public void setServiceReferences(ServiceReferencesMetaData serviceReferences)
+ {
+ this.serviceReferences = serviceReferences;
+ }
+
/**
* Get the resourceReferences.
*
@@ -305,4 +319,8 @@
{
return AbstractMappedMetaData.getByName(name, resourceReferences);
}
+ public ServiceReferenceMetaData getServiceReferenceByName(String name)
+ {
+ return AbstractMappedMetaData.getByName(name, serviceReferences);
+ }
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/IdMetaDataImplWithOverride.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/IdMetaDataImplWithOverride.java 2007-10-17 03:43:12 UTC (rev 66197)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/IdMetaDataImplWithOverride.java 2007-10-17 03:53:29 UTC (rev 66198)
@@ -43,6 +43,18 @@
{
return data;
}
+ /**
+ * Get the override metadata
+ *
+ * @return the data
+ * @throws IllegalStateException when not set
+ */
+ protected T getOverridenMetaDataWithCheck()
+ {
+ if (data == null)
+ throw new IllegalStateException("Override metadata has not been set " + this);
+ return data;
+ }
//@SchemaProperty(ignore=true)
@XmlTransient
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java 2007-10-17 03:43:12 UTC (rev 66197)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java 2007-10-17 03:53:29 UTC (rev 66198)
@@ -21,10 +21,14 @@
*/
package org.jboss.test.metadata.client;
+import org.jboss.metadata.client.spec.ApplicationClient14DTDMetaData;
+import org.jboss.metadata.client.spec.ApplicationClient14MetaData;
import org.jboss.metadata.client.spec.ApplicationClient5MetaData;
+import org.jboss.metadata.client.spec.ApplicationClientMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
+import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
@@ -41,7 +45,7 @@
super(name);
}
- protected void assertEverything(ApplicationClient5MetaData appClientMetaData)
+ protected void assertEverything(ApplicationClientMetaData appClientMetaData)
{
//assertEverythingWithAppMetaData(appClientMetaData);
assertDescriptionGroup("application-client", appClientMetaData.getDescriptionGroup());
@@ -49,8 +53,7 @@
assertEquals("org.jboss.test.metadata.client.AppClientCallbackHandler", appClientMetaData.getCallbackHandler());
assertMessageDestinations5("appClientMessageDestination", 2, appClientMetaData.getMessageDestinations(), true);
}
-
- private void assertMessageDestinations5(String prefix, int size, MessageDestinationsMetaData messageDestinations, boolean full)
+ protected void assertMessageDestinations5(String prefix, int size, MessageDestinationsMetaData messageDestinations, boolean full)
{
assertNotNull("no message destinations are set", messageDestinations);
assertEquals(size, messageDestinations.size());
@@ -64,16 +67,21 @@
public static SchemaBindingResolver initResolver()
{
- return schemaResolverForClass(ApplicationClient5MetaData.class);
+ DefaultSchemaResolver resolver = new DefaultSchemaResolver();
+
+ resolver.addClassBindingForLocation("application-client_1_3.dtd", ApplicationClient14DTDMetaData.class);
+ resolver.addClassBindingForLocation("application-client_1_4.xsd", ApplicationClient14MetaData.class);
+ resolver.addClassBindingForLocation("application-client_5.xsd", ApplicationClient5MetaData.class);
+ return resolver;
}
public void testEverything() throws Exception
{
- ApplicationClient5MetaData appClientMetaData = unmarshal();
+ ApplicationClientMetaData appClientMetaData = unmarshal();
assertEverything(appClientMetaData);
}
- protected ApplicationClient5MetaData unmarshal() throws Exception
+ protected ApplicationClientMetaData unmarshal() throws Exception
{
return unmarshal(ApplicationClient5MetaData.class);
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java 2007-10-17 03:43:12 UTC (rev 66197)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java 2007-10-17 03:53:29 UTC (rev 66198)
@@ -21,22 +21,24 @@
*/
package org.jboss.test.metadata.client;
+import org.jboss.metadata.client.jboss.JBossClient5DTDMetaData;
import org.jboss.metadata.client.jboss.JBossClient5MetaData;
+import org.jboss.metadata.client.jboss.JBossClientMetaData;
+import org.jboss.metadata.client.spec.ApplicationClient14DTDMetaData;
import org.jboss.metadata.client.spec.ApplicationClient14MetaData;
import org.jboss.metadata.client.spec.ApplicationClient5MetaData;
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.metadata.client.spec.ApplicationClientMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
+import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
-import org.jboss.xb.builder.JBossXBBuilder;
-import org.w3c.dom.ls.LSInput;
/**
* Test all entries of an JBoss specific application client descriptor.
*
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @author Scott.Stark at jboss.org
* @version $Revision: $
*/
public class ApplicationClientJBossMergeEverythingUnitTestCase extends AbstractJavaEEEverythingTest
@@ -61,60 +63,34 @@
public static SchemaBindingResolver initResolver()
{
- return new SchemaBindingResolver()
- {
- public String getBaseURI()
- {
- return null;
- }
-
- public SchemaBinding resolve(String nsUri, String baseURI, String schemaLocation)
- {
- SchemaBinding schema;
- if(JavaEEMetaDataConstants.JAVAEE_NS.equals(nsUri))
- {
- schema = JBossXBBuilder.build(ApplicationClient5MetaData.class);
- }
- else if(JavaEEMetaDataConstants.J2EE_NS.equals(nsUri))
- {
- schema = JBossXBBuilder.build(ApplicationClient14MetaData.class);
- }
- else if(JavaEEMetaDataConstants.JBOSS_NS.equals(nsUri))
- {
- schema = JBossXBBuilder.build(JBossClient5MetaData.class);
- }
- else
- {
- throw new IllegalStateException("Unexpected namespace: " + nsUri);
- }
- return schema;
- }
-
- public LSInput resolveAsLSInput(String nsUri, String baseUri, String schemaLocation)
- {
- return null;
- }
-
- public void setBaseURI(String baseURI)
- {
- }
- };
+ DefaultSchemaResolver resolver = new DefaultSchemaResolver();
+
+ resolver.addClassBindingForLocation("application-client_1_3.dtd", ApplicationClient14DTDMetaData.class);
+ resolver.addClassBindingForLocation("application-client_1_4.xsd", ApplicationClient14MetaData.class);
+ resolver.addClassBindingForLocation("application-client_5.xsd", ApplicationClient5MetaData.class);
+ resolver.addClassBindingForLocation("jboss-client_3_2.dtd", JBossClient5DTDMetaData.class);
+ resolver.addClassBindingForLocation("jboss-client_4_0.dtd", JBossClient5DTDMetaData.class);
+ resolver.addClassBindingForLocation("jboss-client_4_2.dtd", JBossClient5DTDMetaData.class);
+ resolver.addClassBindingForLocation("jboss-client_5_0.dtd", JBossClient5DTDMetaData.class);
+ resolver.addClassBindingForLocation("jboss-client_5_0.xsd", JBossClient5MetaData.class);
+ return resolver;
}
public void testAppClient5Everything() throws Exception
{
- ApplicationClient5MetaData appClientMetaData = unmarshal("ApplicationClient5Everything_testEverything.xml", ApplicationClient5MetaData.class, null);
+ ApplicationClientMetaData appClientMetaData = unmarshal("ApplicationClient5Everything_testEverything.xml", ApplicationClientMetaData.class, null);
new ApplicationClient5EverythingUnitTestCase("appClient").assertEverything(appClientMetaData);
- JBossClient5MetaData jbossClientMetaData = unmarshal("JBossClient5Everything_testEverything.xml", JBossClient5MetaData.class, null);
+ JBossClientMetaData jbossClientMetaData = unmarshal("JBossClient5Everything_testEverything.xml", JBossClientMetaData.class, null);
new JBossClient5EverythingUnitTestCase("jbossClient").assertEverything(jbossClientMetaData);
jbossClientMetaData.setOverridenMetaData(appClientMetaData);
// TODO: should this work?
- //assertDescriptionGroup("application-client", jbossClientMetaData.getDescriptionGroup());
+ assertDescriptionGroup("application-client", appClientMetaData.getDescriptionGroup());
assertRemoteEnvironment("appClient", jbossClientMetaData, true);
assertEquals("org.jboss.test.metadata.client.AppClientCallbackHandler", jbossClientMetaData.getCallbackHandler());
assertMessageDestinations5("appClientMessageDestination", 2, jbossClientMetaData.getMergedMessageDestinations(), true);
}
+
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/JBossClient5EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/JBossClient5EverythingUnitTestCase.java 2007-10-17 03:43:12 UTC (rev 66197)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/JBossClient5EverythingUnitTestCase.java 2007-10-17 03:53:29 UTC (rev 66198)
@@ -22,6 +22,7 @@
package org.jboss.test.metadata.client;
import org.jboss.metadata.client.jboss.JBossClient5MetaData;
+import org.jboss.metadata.client.jboss.JBossClientMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
@@ -39,7 +40,7 @@
super(name);
}
- protected void assertEverything(JBossClient5MetaData jbossClientMetaData)
+ protected void assertEverything(JBossClientMetaData jbossClientMetaData)
{
assertEquals("appClientJndiName", jbossClientMetaData.getJndiName());
assertEquals("http://localhost", jbossClientMetaData.getJBossJndiEnvironmentRefsGroup().getResourceReferences().get("appClientResourceRef2Name").getResUrl());
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java 2007-10-17 03:43:12 UTC (rev 66197)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java 2007-10-17 03:53:29 UTC (rev 66198)
@@ -81,6 +81,8 @@
import org.jboss.metadata.javaee.spec.ResourceSharingScopeType;
import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.metadata.javaee.support.IdMetaData;
/**
@@ -386,7 +388,7 @@
if (full)
assertEnvEntries(prefix, 2, environment.getEnvironmentEntries(), full);
assertEjbRefs(prefix, 2, environment.getEjbReferences(), full);
- // TODO service-refGroup
+ assertServiceRefs(prefix, 2, environment.getServiceReferences(), full);
assertResourceRefs(prefix, 2, environment.getResourceReferences(), full);
assertResourceEnvRefs(prefix, 2, environment.getResourceEnvironmentReferences(), full);
assertMessageDestinationRefs(prefix, 3, environment.getMessageDestinationReferences(), full);
@@ -564,6 +566,21 @@
return overriden;
}
+ private void assertServiceRefs(String prefix, int size, ServiceReferencesMetaData serviceReferencesMetaData, boolean full)
+ {
+ assertNotNull("no service refs are set", serviceReferencesMetaData);
+ assertEquals(size, serviceReferencesMetaData.size());
+ int count = 1;
+ for (ServiceReferenceMetaData ref : serviceReferencesMetaData)
+ {
+ assertId(prefix + "ServiceRef" + count, ref);
+ assertDescriptions(prefix + "ServiceRef" + count, ref.getDescriptionGroup().getDescriptions());
+ assertEquals(prefix + "ServiceRef" + count + "Name", ref.getServiceRefName());
+ assertEquals(prefix + "ServiceRef" + count + "Iface", ref.getServiceInterface());
+ // TODO: full ServiceReferenceMetaData properties
+ count ++;
+ }
+ }
private void assertResourceRefs(String prefix, int size, ResourceReferencesMetaData resourceReferencesMetaData, boolean full)
{
assertNotNull("no resource refs are set", resourceReferencesMetaData);
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml 2007-10-17 03:43:12 UTC (rev 66197)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml 2007-10-17 03:53:29 UTC (rev 66198)
@@ -24,7 +24,7 @@
<small-icon>de-application-client-small-icon</small-icon>
<large-icon>de-application-client-large-icon</large-icon>
</icon>
-
+
<!-- env entry -->
<env-entry id="appClientEnvEntry1-id">
<description>en-appClientEnvEntry1-desc</description>
@@ -101,6 +101,23 @@
</injection-target>
</ejb-ref>
+ <!-- service ref -->
+ <!-- TODO: full service-ref contents -->
+ <service-ref id="appClientServiceRef1-id">
+ <description>en-appClientServiceRef1-desc</description>
+ <description xml:lang="fr">fr-appClientServiceRef1-desc</description>
+ <description xml:lang="de">de-appClientServiceRef1-desc</description>
+ <service-ref-name>appClientServiceRef1Name</service-ref-name>
+ <service-interface>appClientServiceRef1Iface</service-interface>
+ </service-ref>
+ <service-ref id="appClientServiceRef2-id">
+ <description>en-appClientServiceRef2-desc</description>
+ <description xml:lang="fr">fr-appClientServiceRef2-desc</description>
+ <description xml:lang="de">de-appClientServiceRef2-desc</description>
+ <service-ref-name>appClientServiceRef2Name</service-ref-name>
+ <service-interface>appClientServiceRef2Iface</service-interface>
+ </service-ref>
+
<!-- resource ref -->
<resource-ref id="appClientResourceRef1-id">
<description>en-appClientResourceRef1-desc</description>
@@ -172,7 +189,7 @@
<injection-target-name>appClientResourceEnvRef2Injection2Name</injection-target-name>
</injection-target>
</resource-env-ref>
-
+
<!-- message destination ref -->
<message-destination-ref id="appClientMessageDestinationRef1-id">
<description>en-appClientMessageDestinationRef1-desc</description>
More information about the jboss-cvs-commits
mailing list