[jbossws-commits] JBossWS SVN: r6990 - in stack/native/trunk: modules/core/src/main/java/org/jboss/ws/extensions/policy/metadata and 1 other directories.
Author: thomas.diesler(a)jboss.com
Date: 2008-05-09 06:27:32 -0400 (Fri, 09 May 2008)
New Revision: 6990
Modified:
stack/native/trunk/.classpath
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java
stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml
Log:
Fix wssecurityAnnotatedpolicy
Modified: stack/native/trunk/.classpath
===================================================================
--- stack/native/trunk/.classpath 2008-05-09 09:13:21 UTC (rev 6989)
+++ stack/native/trunk/.classpath 2008-05-09 10:27:32 UTC (rev 6990)
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src"
path="modules/saaj/src/main/java"/>
+ <classpathentry kind="src"
path="modules/testsuite/framework-tests/target/wsconsume/java"/>
+ <classpathentry kind="src"
path="modules/testsuite/native-tests/target/wsconsume/java"/>
+ <classpathentry kind="src"
path="modules/testsuite/framework-tests/src/test/java"/>
+ <classpathentry kind="src"
path="modules/testsuite/native-tests/src/test/java"/>
<classpathentry kind="src"
path="modules/jaxrpc/src/main/java"/>
<classpathentry kind="src"
path="modules/jaxws/src/main/java"/>
<classpathentry kind="src"
path="modules/jaxws-ext/src/main/java"/>
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2008-05-09
09:13:21 UTC (rev 6989)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2008-05-09
10:27:32 UTC (rev 6990)
@@ -21,6 +21,7 @@
*/
package org.jboss.ws.extensions.policy.metadata;
+import java.io.IOException;
import java.io.InputStream;
import java.util.List;
import java.util.StringTokenizer;
@@ -104,7 +105,7 @@
return builder;
}
- public void processPolicyAnnotations(EndpointMetaData epMetaData, Class<?>
sepClass)
+ public void processPolicyAnnotations(EndpointMetaData epMetaData, Class<?>
sepClass) throws IOException
{
UnifiedVirtualFile vfRoot =
epMetaData.getServiceMetaData().getUnifiedMetaData().getRootFile();
for (org.jboss.ws.extensions.policy.annotation.Policy anPolicy :
sepClass.getAnnotation(PolicyAttachment.class).value())
@@ -135,10 +136,6 @@
throw new WSException("Policy scope " + scope + " not
supported yet!");
}
}
- catch (Exception e)
- {
- log.error(e);
- }
finally
{
try
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml
===================================================================
---
stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2008-05-09
09:13:21 UTC (rev 6989)
+++
stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2008-05-09
10:27:32 UTC (rev 6990)
@@ -21,7 +21,8 @@
<classpath>
<pathelement path="${maven.test.classpath}"/>
</classpath>
- </taskdef>
+ <classpath
location="${tests.output.dir}/test-resources/jaxws/samples/wssecurityAnnotatedpolicy"/>
+ </taskdef>
<wsprovide
resourcedestdir="${tests.output.dir}/test-resources/wsprovide/jaxws/samples/wssecurity"
genwsdl="true"
sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"
destdir="${tests.output.dir}/test-classes" verbose="false"/>
<wsprovide
resourcedestdir="${tests.output.dir}/test-resources/wsprovide/jaxws/samples/wssecurityAnnotatedpolicy"
genwsdl="true"
sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean"
destdir="${tests.output.dir}/test-classes" verbose="false"/>