[jboss-svn-commits] JBoss Common SVN: r2608 - in jbossxb/trunk/src/test/java/org/jboss: test/ejb/metadata/test and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Oct 5 18:39:13 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-05 18:39:13 -0400 (Fri, 05 Oct 2007)
New Revision: 2608
Added:
jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/ParamValueMetaData.java
Modified:
jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/ServiceReferenceHandlerChainMetaData.java
jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/ServiceReferenceHandlerChainsMetaData.java
jbossxb/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar3xUnitTestCase.java
Log:
Flatten out the service-ref metadata
Added: jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/ParamValueMetaData.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/ParamValueMetaData.java (rev 0)
+++ jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/ParamValueMetaData.java 2007-10-05 22:39:13 UTC (rev 2608)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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.javaee.metadata.spec;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class ParamValueMetaData extends DescriptionImpl
+{
+ private static final long serialVersionUID = 1;
+
+ private String paramName;
+ private String paramValue;
+ public String getParamName()
+ {
+ return paramName;
+ }
+ public void setParamName(String paramName)
+ {
+ this.paramName = paramName;
+ }
+ public String getParamValue()
+ {
+ return paramValue;
+ }
+ public void setParamValue(String paramValue)
+ {
+ this.paramValue = paramValue;
+ }
+
+}
Property changes on: jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/ParamValueMetaData.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/ServiceReferenceHandlerChainMetaData.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/ServiceReferenceHandlerChainMetaData.java 2007-10-05 22:23:13 UTC (rev 2607)
+++ jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/ServiceReferenceHandlerChainMetaData.java 2007-10-05 22:39:13 UTC (rev 2608)
@@ -22,11 +22,14 @@
package org.jboss.javaee.metadata.spec;
import java.io.Serializable;
+import java.util.List;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import org.jboss.javaee.metadata.support.IdMetaDataImpl;
+
/**
* ServiceReferenceHandlerChainMetaData.
*
@@ -35,22 +38,20 @@
*/
//@SchemaType(name="service-ref_handler-chainType", mandatory=false)
@XmlType(name="service-ref_handler-chainType")
-public class ServiceReferenceHandlerChainMetaData implements Serializable
+public class ServiceReferenceHandlerChainMetaData
+ extends IdMetaDataImpl
{
/** The serialVersionUID */
private static final long serialVersionUID = -1266911268623169174L;
- /** The id */
- private String id;
+ private String serviceNamePattern;
- private String serviceNamePatter;
-
private String portNamePattern;
// TODO protocol-bindings
/** The handlers */
- private ServiceReferenceHandlersMetaData handlers;
+ private List<ServiceReferenceHandlerMetaData> handlers;
/**
* Create a new ServiceReferenceHandlerChainMetaData.
@@ -66,68 +67,32 @@
return portNamePattern;
}
-
public void setPortNamePattern(String portNamePattern)
{
this.portNamePattern = portNamePattern;
}
- public String getServiceNamePatter()
+ public String getServiceNamePattern()
{
- return serviceNamePatter;
+ return serviceNamePattern;
}
- public void setServiceNamePatter(String serviceNamePatter)
+ public void setServiceNamePattern(String serviceNamePatter)
{
- this.serviceNamePatter = serviceNamePatter;
+ this.serviceNamePattern = serviceNamePatter;
}
- /**
- * Get the handlers.
- *
- * @return the handlers.
- */
- public ServiceReferenceHandlersMetaData getHandlers()
+
+ public List<ServiceReferenceHandlerMetaData> getHandler()
{
return handlers;
}
- /**
- * Set the handlers.
- *
- * @param handlers the handlers.
- * @throws IllegalArgumentException for a null handlers
- */
- @XmlElement(name="handler-chain")
- public void setHandlers(ServiceReferenceHandlersMetaData handlers)
+ public void setHandler(List<ServiceReferenceHandlerMetaData> handlers)
{
- if (handlers == null)
- throw new IllegalArgumentException("Null handlers");
this.handlers = handlers;
}
- /**
- * Get the id.
- *
- * @return the id.
- */
- public String getId()
- {
- return id;
- }
-
- /**
- * Set the id.
- *
- * @param id the id.
- * @throws IllegalArgumentException for a null id
- */
- public void setId(String id)
- {
- if (id == null)
- throw new IllegalArgumentException("Null id");
- this.id = id;
- }
}
Modified: jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/ServiceReferenceHandlerChainsMetaData.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/ServiceReferenceHandlerChainsMetaData.java 2007-10-05 22:23:13 UTC (rev 2607)
+++ jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/ServiceReferenceHandlerChainsMetaData.java 2007-10-05 22:39:13 UTC (rev 2608)
@@ -21,8 +21,12 @@
*/
package org.jboss.javaee.metadata.spec;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import org.jboss.javaee.metadata.support.IdMetaDataImpl;
import org.jboss.javaee.metadata.support.NonNullLinkedHashSet;
/**
@@ -33,10 +37,13 @@
*/
//@SchemaType(name="service-ref_handler-chainsType", mandatory=false)
@XmlType(name="service-ref_handler-chainsType")
-public class ServiceReferenceHandlerChainsMetaData extends NonNullLinkedHashSet<ServiceReferenceHandlerChainMetaData>
+public class ServiceReferenceHandlerChainsMetaData
+ // extends NonNullLinkedHashSet<ServiceReferenceHandlerChainMetaData>
+ extends IdMetaDataImpl
{
/** The serialVersionUID */
private static final long serialVersionUID = -480961032781276640L;
+ private List<ServiceReferenceHandlerChainMetaData> handlers;
/**
* Create a new ServiceReferenceChainssMetaData.
@@ -45,4 +52,15 @@
{
// For serialization
}
+
+ public List<ServiceReferenceHandlerChainMetaData> getHandlers()
+ {
+ return handlers;
+ }
+
+ @XmlElement(name = "handler-chain", required = true)
+ public void setHandlers(List<ServiceReferenceHandlerChainMetaData> handlers)
+ {
+ this.handlers = handlers;
+ }
}
Modified: jbossxb/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar3xUnitTestCase.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar3xUnitTestCase.java 2007-10-05 22:23:13 UTC (rev 2607)
+++ jbossxb/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar3xUnitTestCase.java 2007-10-05 22:39:13 UTC (rev 2608)
@@ -42,6 +42,9 @@
import org.jboss.javaee.metadata.spec.EnvironmentEntryMetaData;
import org.jboss.javaee.metadata.spec.IconImpl;
import org.jboss.javaee.metadata.spec.ResourceInjectionTargetMetaData;
+import org.jboss.javaee.metadata.spec.ServiceReferenceHandlerChainsMetaData;
+import org.jboss.javaee.metadata.spec.ServiceReferenceHandlersMetaData;
+import org.jboss.javaee.metadata.spec.ServiceReferenceMetaData;
import org.jboss.javaee.metadata.spec.ServiceReferencesMetaData;
//import org.jboss.metadata.ApplicationMetaData;
//import org.jboss.metadata.BeanMetaData;
@@ -200,6 +203,11 @@
EnterpriseBeanMetaData bean = beans.get("StatelessSession1");
ServiceReferencesMetaData serviceRefs = bean.getServiceReferences();
assertNotNull(serviceRefs);
+ ServiceReferenceMetaData ref = serviceRefs.get("session1/Hello");
+ ServiceReferenceHandlerChainsMetaData chains = ref.getHandlerChains();
+ assertNotNull(chains);
+ ServiceReferenceHandlersMetaData handlers = ref.getHandlers();
+ assertTrue(handlers == null);
}
/**
More information about the jboss-svn-commits
mailing list