[jboss-cvs] JBossAS SVN: r65587 - in trunk: server/src/main/org/jboss/metadata and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Sep 24 11:24:15 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-09-24 11:24:15 -0400 (Mon, 24 Sep 2007)
New Revision: 65587
Added:
trunk/server/src/main/org/jboss/metadata/WebserviceDescription.java
trunk/server/src/main/org/jboss/metadata/Webservices.java
Modified:
trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java
trunk/server/src/main/org/jboss/metadata/ApplicationMetaData.java
trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB21.java
Log:
[JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0
Modified: trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java 2007-09-24 15:01:17 UTC (rev 65586)
+++ trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java 2007-09-24 15:24:15 UTC (rev 65587)
@@ -50,8 +50,8 @@
import org.jboss.metadata.SecurityIdentityMetaData;
import org.jboss.metadata.SecurityRoleMetaData;
import org.jboss.metadata.SessionMetaData;
-import org.jboss.metadata.ApplicationMetaData.WebserviceDescription;
-import org.jboss.metadata.ApplicationMetaData.Webservices;
+import org.jboss.metadata.WebserviceDescription;
+import org.jboss.metadata.Webservices;
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
import org.jboss.xb.binding.UnmarshallingContext;
Modified: trunk/server/src/main/org/jboss/metadata/ApplicationMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/ApplicationMetaData.java 2007-09-24 15:01:17 UTC (rev 65586)
+++ trunk/server/src/main/org/jboss/metadata/ApplicationMetaData.java 2007-09-24 15:24:15 UTC (rev 65587)
@@ -27,7 +27,6 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -1048,73 +1047,4 @@
{
this.assemblyDescriptor.mergeSecurityRoles(applRoles);
}
-
- public static class Webservices
- {
- private String contextRoot;
- private List<WebserviceDescription> webserviceDescriptions = new ArrayList<WebserviceDescription>();
-
- public String getContextRoot()
- {
- return contextRoot;
- }
-
- public void setContextRoot(String contextRoot)
- {
- this.contextRoot = contextRoot;
- }
-
- public List<WebserviceDescription> getWebserviceDescriptions()
- {
- return webserviceDescriptions;
- }
- }
-
- public static class WebserviceDescription
- {
- private String descriptionName;
- private String configName;
- private String configFile;
- private String wsdlPublishLocation;
-
- public String getConfigFile()
- {
- return configFile;
- }
-
- public void setConfigFile(String configFile)
- {
- this.configFile = configFile;
- }
-
- public String getConfigName()
- {
- return configName;
- }
-
- public void setConfigName(String configName)
- {
- this.configName = configName;
- }
-
- public String getDescriptionName()
- {
- return descriptionName;
- }
-
- public void setDescriptionName(String descriptionName)
- {
- this.descriptionName = descriptionName;
- }
-
- public String getWsdlPublishLocation()
- {
- return wsdlPublishLocation;
- }
-
- public void setWsdlPublishLocation(String wsdlPublishLocation)
- {
- this.wsdlPublishLocation = wsdlPublishLocation;
- }
- }
}
Added: trunk/server/src/main/org/jboss/metadata/WebserviceDescription.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/WebserviceDescription.java (rev 0)
+++ trunk/server/src/main/org/jboss/metadata/WebserviceDescription.java 2007-09-24 15:24:15 UTC (rev 65587)
@@ -0,0 +1,52 @@
+/**
+ *
+ */
+package org.jboss.metadata;
+
+public class WebserviceDescription
+{
+ private String descriptionName;
+ private String configName;
+ private String configFile;
+ private String wsdlPublishLocation;
+
+ public String getConfigFile()
+ {
+ return configFile;
+ }
+
+ public void setConfigFile(String configFile)
+ {
+ this.configFile = configFile;
+ }
+
+ public String getConfigName()
+ {
+ return configName;
+ }
+
+ public void setConfigName(String configName)
+ {
+ this.configName = configName;
+ }
+
+ public String getDescriptionName()
+ {
+ return descriptionName;
+ }
+
+ public void setDescriptionName(String descriptionName)
+ {
+ this.descriptionName = descriptionName;
+ }
+
+ public String getWsdlPublishLocation()
+ {
+ return wsdlPublishLocation;
+ }
+
+ public void setWsdlPublishLocation(String wsdlPublishLocation)
+ {
+ this.wsdlPublishLocation = wsdlPublishLocation;
+ }
+}
\ No newline at end of file
Added: trunk/server/src/main/org/jboss/metadata/Webservices.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/Webservices.java (rev 0)
+++ trunk/server/src/main/org/jboss/metadata/Webservices.java 2007-09-24 15:24:15 UTC (rev 65587)
@@ -0,0 +1,29 @@
+/**
+ *
+ */
+package org.jboss.metadata;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class Webservices
+{
+ private String contextRoot;
+ private List<WebserviceDescription> webserviceDescriptions = new ArrayList<WebserviceDescription>();
+
+ public String getContextRoot()
+ {
+ return contextRoot;
+ }
+
+ public void setContextRoot(String contextRoot)
+ {
+ this.contextRoot = contextRoot;
+ }
+
+ public List<WebserviceDescription> getWebserviceDescriptions()
+ {
+ return webserviceDescriptions;
+ }
+}
\ No newline at end of file
Modified: trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java 2007-09-24 15:01:17 UTC (rev 65586)
+++ trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java 2007-09-24 15:24:15 UTC (rev 65587)
@@ -36,6 +36,7 @@
import org.jboss.metadata.ResourceRefMetaData;
import org.jboss.metadata.SecurityRoleMetaData;
import org.jboss.metadata.WebMetaData;
+import org.jboss.metadata.WebserviceDescription;
import org.jboss.mx.loading.LoaderRepositoryFactory;
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.util.xml.JBossEntityResolver;
@@ -130,9 +131,9 @@
else if (localName.equals("passivation-config"))
child = new PassivationConfig();
else if (localName.equals("message-destination"))
- {
child = new MessageDestinationMetaData();
- }
+ else if (localName.equals("webservice-description"))
+ child = new WebserviceDescription();
return child;
}
@@ -229,6 +230,14 @@
parent.updateServlet(servlet);
}
+ public void addChild(WebMetaData parent, WebserviceDescription wsd, UnmarshallingContext navigator, String namespaceURI, String localName)
+ {
+ parent.setConfigName(wsd.getConfigName());
+ parent.setConfigFile(wsd.getConfigFile());
+ if (wsd.getWsdlPublishLocation() != null)
+ parent.getWsdlPublishLocations().put(wsd.getDescriptionName(), wsd.getWsdlPublishLocation());
+ }
+
public void setValue(WebMetaData dd, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("depends"))
@@ -341,4 +350,24 @@
cfg.repositoryConfig = value;
}
}
+
+ public void setValue(WebserviceDescription wsd, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+ {
+ if (localName.equals("webservice-description-name"))
+ {
+ wsd.setDescriptionName(value);
+ }
+ else if (localName.equals("config-name"))
+ {
+ wsd.setConfigName(value);
+ }
+ else if (localName.equals("config-file"))
+ {
+ wsd.setConfigFile(value);
+ }
+ else if (localName.equals("wsdl-publish-location"))
+ {
+ wsd.setWsdlPublishLocation(value);
+ }
+ }
}
Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB21.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB21.java 2007-09-24 15:01:17 UTC (rev 65586)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB21.java 2007-09-24 15:24:15 UTC (rev 65587)
@@ -26,8 +26,6 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
import org.jboss.metadata.*;
-import org.jboss.metadata.ApplicationMetaData.WebserviceDescription;
-import org.jboss.metadata.ApplicationMetaData.Webservices;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.metadata.j2ee.*;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData.PublishLocationAdapter;
More information about the jboss-cvs-commits
mailing list