[jbossws-commits] JBossWS SVN: r3122 - in branches/JBWS-856/jbossws-core/src/java/org/jboss/ws: metadata/builder/jaxws and 1 other directory.
Author: palin
Date: 2007-05-17 08:18:13 -0400 (Thu, 17 May 2007)
New Revision: 3122
Modified:
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
Log:
wsprovide now works with @Policy annotation too
Modified:
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java
===================================================================
---
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-05-17
11:55:45 UTC (rev 3121)
+++
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-05-17
12:18:13 UTC (rev 3122)
@@ -96,11 +96,6 @@
InputStream is = null;
try
{
-
System.out.println("++++++++++++++++++++"+policy.policyFileLocation());
- System.out.println("++++++++++++++++++++"+toolMode);
-
System.out.println("++++++++++++++++++++"+Thread.currentThread().getContextClassLoader().getResource(policy.policyFileLocation()));
-
-
DOMPolicyReader reader = (DOMPolicyReader)
PolicyFactory.getPolicyReader(PolicyFactory.DOM_POLICY_READER);
if (toolMode)
{
@@ -117,7 +112,6 @@
PolicyScopeLevel.WSDL_BINDING.equals(scope))
{
deployPolicy(normPolicy, scope, epMetaData);
-
System.out.println("++++++++++++++++++++"+epMetaData.getExtensions());
}
else
{
Modified:
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
---
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-17
11:55:45 UTC (rev 3121)
+++
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-17
12:18:13 UTC (rev 3122)
@@ -132,23 +132,21 @@
createJAXBContext(sepMetaData);
populateXmlTypes(sepMetaData);
- // The server must always generate WSDL
- if (generateWsdl || !toolMode)
- processOrGenerateWSDL(seiClass, serviceMetaData, result.wsdlLocation,
sepMetaData, result.policyLocation);
-
-// Process an optional @PolicyAttachment annotation
+ //Process an optional @PolicyAttachment annotation
if (sepClass.isAnnotationPresent(PolicyAttachment.class))
{
PolicyMetaDataBuilder policyBuilder =
PolicyMetaDataBuilder.getServerSidePolicyMetaDataBuilder(toolMode);
policyBuilder.processPolicyAnnotations(sepMetaData, sepClass, udi);
}
-
+ // The server must always generate WSDL
+ if (generateWsdl || !toolMode)
+ processOrGenerateWSDL(seiClass, serviceMetaData, result.wsdlLocation,
sepMetaData, result.policyLocation);
+
// No need to process endpoint items if we are in tool mode
if (toolMode)
return sepMetaData;
-
// Sanity check: read the generated WSDL and initialize the schema model
// Note, this should no longer be needed, look into removing it
WSDLDefinitions wsdlDefinitions = serviceMetaData.getWsdlDefinitions();