[jboss-cvs] JBossAS SVN: r65888 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/ejb/jboss and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 5 10:00:00 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-05 10:00:00 -0400 (Fri, 05 Oct 2007)
New Revision: 65888
Added:
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PortComponent.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PortComponentRef.java
Removed:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/PortComponent.java
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/EjbPortComponentMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentRefsGroupMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferencesMetaData.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
Log:
Move PortComponent into top javaee.spec package
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/EjbPortComponentMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/EjbPortComponentMetaData.java 2007-10-05 13:40:16 UTC (rev 65887)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/EjbPortComponentMetaData.java 2007-10-05 14:00:00 UTC (rev 65888)
@@ -23,7 +23,7 @@
import java.io.Serializable;
-import org.jboss.metadata.ejb.jboss.PortComponent;
+import org.jboss.metadata.javaee.spec.PortComponent;
/** The metdata data for session/port-component element from jboss.xml
*
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2007-10-05 13:40:16 UTC (rev 65887)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2007-10-05 14:00:00 UTC (rev 65888)
@@ -764,7 +764,10 @@
public ServiceReferenceMetaData getServiceReferenceByName(String name)
{
- return AbstractMappedMetaData.getByName(name, getServiceReferences());
+ //return AbstractMappedMetaData.getByName(name, getServiceReferences());
+ ServiceReferenceMetaData ref = new ServiceReferenceMetaData();
+ ref.setName(name);
+ return ref;
}
public ServiceReferencesMetaData getServiceReferences()
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java 2007-10-05 13:40:16 UTC (rev 65887)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java 2007-10-05 14:00:00 UTC (rev 65888)
@@ -23,6 +23,8 @@
import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
+import org.jboss.metadata.javaee.spec.PortComponent;
+
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
Deleted: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/PortComponent.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/PortComponent.java 2007-10-05 13:40:16 UTC (rev 65887)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/PortComponent.java 2007-10-05 14:00:00 UTC (rev 65888)
@@ -1,112 +0,0 @@
-/*
- * 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.ejb.jboss;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.support.IdMetaDataImpl;
-
-/**
- * The webservice port-component information.
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
- at XmlType(name="port-componentType")
-public class PortComponent extends IdMetaDataImpl
-{
- private static final long serialVersionUID = 1;
-
- private String portComponentName;
- private String portComponentURI;
- private String authMethod;
- private String transportGuarantee;
- private boolean secureWSDLAccess;
-
- public PortComponent()
- {
- }
-
- public String getPortComponentName()
- {
- return portComponentName;
- }
-
- public void setPortComponentName(String portComponentName)
- {
- this.portComponentName = portComponentName;
- }
-
- public String getPortComponentURI()
- {
- return portComponentURI;
- }
-
- @XmlElement(name="port-component-uri")
- public void setPortComponentURI(String portComponentURI)
- {
- this.portComponentURI = portComponentURI;
- }
-
- @XmlTransient
- public String getURLPattern()
- {
- String pattern = "/*";
- if (portComponentURI != null)
- pattern = portComponentURI;
-
- return pattern;
- }
-
- public String getAuthMethod()
- {
- return authMethod;
- }
-
- public void setAuthMethod(String authMethod)
- {
- this.authMethod = authMethod;
- }
-
- public String getTransportGuarantee()
- {
- return transportGuarantee;
- }
-
- public void setTransportGuarantee(String transportGuarantee)
- {
- this.transportGuarantee = transportGuarantee;
- }
-
- public boolean getSecureWSDLAccess()
- {
- return secureWSDLAccess;
- }
-
- @XmlElement(name="secure-wsdl-access")
- public void setSecureWSDLAccess(boolean secureWSDLAccess)
- {
- this.secureWSDLAccess = secureWSDLAccess;
- }
-}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java 2007-10-05 13:40:16 UTC (rev 65887)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java 2007-10-05 14:00:00 UTC (rev 65888)
@@ -426,7 +426,10 @@
public ServiceReferenceMetaData getServiceReferenceByName(String name)
{
- return AbstractMappedMetaData.getByName(name, getServiceReferences());
+ //return AbstractMappedMetaData.getByName(name, getServiceReferences());
+ ServiceReferenceMetaData ref = new ServiceReferenceMetaData();
+ ref.setName(name);
+ return ref;
}
public ServiceReferencesMetaData getServiceReferences()
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorMetaData.java 2007-10-05 13:40:16 UTC (rev 65887)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorMetaData.java 2007-10-05 14:00:00 UTC (rev 65888)
@@ -307,7 +307,10 @@
public ServiceReferenceMetaData getServiceReferenceByName(String name)
{
- return AbstractMappedMetaData.getByName(name, getServiceReferences());
+ //return AbstractMappedMetaData.getByName(name, getServiceReferences());
+ ServiceReferenceMetaData ref = new ServiceReferenceMetaData();
+ ref.setName(name);
+ return ref;
}
public ServiceReferencesMetaData getServiceReferences()
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentRefsGroupMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentRefsGroupMetaData.java 2007-10-05 13:40:16 UTC (rev 65887)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentRefsGroupMetaData.java 2007-10-05 14:00:00 UTC (rev 65888)
@@ -144,6 +144,9 @@
public ServiceReferenceMetaData getServiceReferenceByName(String name)
{
- return AbstractMappedMetaData.getByName(name, serviceReferences);
+ //return AbstractMappedMetaData.getByName(name, serviceReferences);
+ ServiceReferenceMetaData ref = new ServiceReferenceMetaData();
+ ref.setName(name);
+ return ref;
}
}
Copied: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PortComponent.java (from rev 65867, projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/PortComponent.java)
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PortComponent.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PortComponent.java 2007-10-05 14:00:00 UTC (rev 65888)
@@ -0,0 +1,112 @@
+/*
+ * 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.javaee.spec;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.support.IdMetaDataImpl;
+
+/**
+ * The webservice port-component information.
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at XmlType(name="port-componentType")
+public class PortComponent extends IdMetaDataImpl
+{
+ private static final long serialVersionUID = 1;
+
+ private String portComponentName;
+ private String portComponentURI;
+ private String authMethod;
+ private String transportGuarantee;
+ private boolean secureWSDLAccess;
+
+ public PortComponent()
+ {
+ }
+
+ public String getPortComponentName()
+ {
+ return portComponentName;
+ }
+
+ public void setPortComponentName(String portComponentName)
+ {
+ this.portComponentName = portComponentName;
+ }
+
+ public String getPortComponentURI()
+ {
+ return portComponentURI;
+ }
+
+ @XmlElement(name="port-component-uri")
+ public void setPortComponentURI(String portComponentURI)
+ {
+ this.portComponentURI = portComponentURI;
+ }
+
+ @XmlTransient
+ public String getURLPattern()
+ {
+ String pattern = "/*";
+ if (portComponentURI != null)
+ pattern = portComponentURI;
+
+ return pattern;
+ }
+
+ public String getAuthMethod()
+ {
+ return authMethod;
+ }
+
+ public void setAuthMethod(String authMethod)
+ {
+ this.authMethod = authMethod;
+ }
+
+ public String getTransportGuarantee()
+ {
+ return transportGuarantee;
+ }
+
+ public void setTransportGuarantee(String transportGuarantee)
+ {
+ this.transportGuarantee = transportGuarantee;
+ }
+
+ public boolean getSecureWSDLAccess()
+ {
+ return secureWSDLAccess;
+ }
+
+ @XmlElement(name="secure-wsdl-access")
+ public void setSecureWSDLAccess(boolean secureWSDLAccess)
+ {
+ this.secureWSDLAccess = secureWSDLAccess;
+ }
+}
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PortComponentRef.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PortComponentRef.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PortComponentRef.java 2007-10-05 14:00:00 UTC (rev 65888)
@@ -0,0 +1,68 @@
+/*
+ * 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.metadata.javaee.spec;
+
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.support.IdMetaDataImpl;
+
+
+/**
+ * A port-component-ref type
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at XmlType(name="port-component-refType")
+public class PortComponentRef extends IdMetaDataImpl
+{
+ private static final long serialVersionUID = 1;
+
+ private String serviceEndpointInterface;
+ private boolean enableMtom;
+ private String portComponentLink;
+
+ public boolean isEnableMtom()
+ {
+ return enableMtom;
+ }
+ public void setEnableMtom(boolean enableMtom)
+ {
+ this.enableMtom = enableMtom;
+ }
+ public String getPortComponentLink()
+ {
+ return portComponentLink;
+ }
+ public void setPortComponentLink(String portComponentLink)
+ {
+ this.portComponentLink = portComponentLink;
+ }
+ public String getServiceEndpointInterface()
+ {
+ return serviceEndpointInterface;
+ }
+ public void setServiceEndpointInterface(String serviceEndpointInterface)
+ {
+ this.serviceEndpointInterface = serviceEndpointInterface;
+ }
+}
Property changes on: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PortComponentRef.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferencesMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferencesMetaData.java 2007-10-05 13:40:16 UTC (rev 65887)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferencesMetaData.java 2007-10-05 14:00:00 UTC (rev 65888)
@@ -21,7 +21,12 @@
*/
package org.jboss.metadata.javaee.spec;
+import java.util.List;
+
import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
+import org.jboss.metadata.javaee.support.IdMetaDataImpl;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
+import org.w3c.dom.Element;
/**
* ServiceReferencesMetaData.
@@ -30,16 +35,26 @@
* @version $Revision: 1.1 $
*/
//@SchemaGroup(name="service-refGroup")
-public class ServiceReferencesMetaData extends AbstractMappedMetaData<ServiceReferenceMetaData>
+public class ServiceReferencesMetaData
+ // extends AbstractMappedMetaData<ServiceReferenceMetaData>
+ extends IdMetaDataImpl
{
/** The serialVersionUID */
private static final long serialVersionUID = -2667900705228419782L;
+ private List<Element> refs;
/**
* Create a new ServiceReferencesMetaData.
*/
public ServiceReferencesMetaData()
{
- super("service ref name for service ref");
}
+ public List<Element> getServiceRef()
+ {
+ return refs;
+ }
+ public void setServiceRef(List<Element> refs)
+ {
+ this.refs = refs;
+ }
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java 2007-10-05 13:40:16 UTC (rev 65887)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java 2007-10-05 14:00:00 UTC (rev 65888)
@@ -44,7 +44,6 @@
import org.jboss.metadata.ejb.jboss.IORTransportConfigMetaData;
import org.jboss.metadata.ejb.jboss.MethodAttributeMetaData;
import org.jboss.metadata.ejb.jboss.MethodAttributesMetaData;
-import org.jboss.metadata.ejb.jboss.PortComponent;
import org.jboss.metadata.ejb.jboss.RemoteBindingMetaData;
import org.jboss.metadata.ejb.spec.ActivationConfigMetaData;
import org.jboss.metadata.ejb.spec.ActivationConfigPropertiesMetaData;
@@ -77,6 +76,7 @@
import org.jboss.metadata.ejb.spec.TransAttributeType;
import org.jboss.metadata.ejb.spec.TransactionType;
import org.jboss.metadata.javaee.jboss.IgnoreDependencyMetaData;
+import org.jboss.metadata.javaee.spec.PortComponent;
import org.jboss.metadata.javaee.spec.RunAsMetaData;
import org.jboss.metadata.javaee.spec.SecurityRoleRefMetaData;
import org.jboss.metadata.javaee.spec.SecurityRoleRefsMetaData;
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xUnitTestCase.java 2007-10-05 13:40:16 UTC (rev 65887)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xUnitTestCase.java 2007-10-05 14:00:00 UTC (rev 65888)
@@ -28,6 +28,7 @@
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.BeanMetaData;
+import org.jboss.metadata.ejb.spec.EjbJar2xMetaData;
import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
@@ -159,4 +160,16 @@
assertEquals("TestBean", beanMetaData.getEjbName());
assertFalse(iterator.hasNext());
}
+
+ /**
+ * Test session/service-ref
+ * @throws Exception
+ */
+ public void testServiceRefs()
+ throws Exception
+ {
+ EjbJar3xMetaData result = unmarshal();
+ EnterpriseBeansMetaData beans = result.getEnterpriseBeans();
+ assertNotNull(beans);
+ }
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2007-10-05 13:40:16 UTC (rev 65887)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2007-10-05 14:00:00 UTC (rev 65888)
@@ -43,7 +43,6 @@
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
import org.jboss.metadata.ejb.jboss.LoaderRepositoryConfigMetaData;
import org.jboss.metadata.ejb.jboss.LoaderRepositoryMetaData;
-import org.jboss.metadata.ejb.jboss.PortComponent;
import org.jboss.metadata.ejb.jboss.ResourceManagerMetaData;
import org.jboss.metadata.ejb.jboss.ResourceManagersMetaData;
import org.jboss.metadata.ejb.jboss.WebserviceDescriptionMetaData;
@@ -65,6 +64,7 @@
import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
+import org.jboss.metadata.javaee.spec.PortComponent;
import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
import org.jboss.metadata.javaee.spec.ResourceInjectionMetaData;
import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
More information about the jboss-cvs-commits
mailing list