[jbossws-commits] JBossWS SVN: r3117 - in branches/JBWS-856: jbossws-tests and 1 other directories.
Author: maeste
Date: 2007-05-17 03:47:21 -0400 (Thu, 17 May 2007)
New Revision: 3117
Modified:
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
branches/JBWS-856/jbossws-tests/ant-import/build-samples-jaxws.xml
branches/JBWS-856/jbossws-tests/build.xml
Log:
Fixed resorce reading by tool
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-16
23:32:57 UTC (rev 3116)
+++
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-17
07:47:21 UTC (rev 3117)
@@ -136,18 +136,19 @@
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;
-
- //Process an optional @PolicyAttachment annotation
- //TODO!! Move this before toolMode return after pacthing error with policy
annotation resource reading
+// Process an optional @PolicyAttachment annotation
if (sepClass.isAnnotationPresent(PolicyAttachment.class))
{
PolicyMetaDataBuilder policyBuilder =
PolicyMetaDataBuilder.getServerSidePolicyMetaDataBuilder(toolMode);
policyBuilder.processPolicyAnnotations(sepMetaData, sepClass, udi);
}
+
+ // 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();
Modified: branches/JBWS-856/jbossws-tests/ant-import/build-samples-jaxws.xml
===================================================================
--- branches/JBWS-856/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-05-16 23:32:57
UTC (rev 3116)
+++ branches/JBWS-856/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-05-17 07:47:21
UTC (rev 3117)
@@ -469,8 +469,8 @@
<include name="wsse.truststore"/>
</webinf>
<webinf
dir="${tests.output.dir}/resources/jaxws/samples/wssecuritypolicy/WEB-INF">
- <include name="PolicyAttachmentFragment.wsdl"/>
- </webinf>
+ <include name="PolicyAttachmentFragment.wsdl"/>
+ </webinf>
</war>
<!-- jaxws-samples-wssecurityAnnotatedpolicy-encrypt -->
<war
warfile="${tests.output.dir}/libs/jaxws-samples-wssecurityAnnotatedpolicy-encrypt.war"
webxml="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy/WEB-INF/web.xml">
Modified: branches/JBWS-856/jbossws-tests/build.xml
===================================================================
--- branches/JBWS-856/jbossws-tests/build.xml 2007-05-16 23:32:57 UTC (rev 3116)
+++ branches/JBWS-856/jbossws-tests/build.xml 2007-05-17 07:47:21 UTC (rev 3117)
@@ -355,6 +355,7 @@
<classpath location="${thirdparty.dir}/commons-logging.jar"/>
<classpath location="${tests.output.dir}/classes"/>
<classpath
location="${tests.output.dir}/resources/jaxws/samples/wssecuritypolicy"/>
+ <classpath
location="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy"/>
</taskdef>
<wsprovide
resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity"
genwsdl="true"
sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/>