You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by br...@apache.org on 2007/05/18 18:33:56 UTC
svn commit: r539550 - in /incubator/yoko/trunk/tools/src:
main/java/org/apache/yoko/tools/processors/idl/IDLToWSDLProcessor.java
test/java/org/apache/yoko/tools/processors/IDLToWSDLGenerationTest.java
Author: bravi
Date: Fri May 18 11:33:55 2007
New Revision: 539550
URL: http://svn.apache.org/viewvc?view=rev&rev=539550
Log:
Fixing the tools module continuum failure.
Modified:
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/IDLToWSDLProcessor.java
incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/IDLToWSDLGenerationTest.java
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/IDLToWSDLProcessor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/IDLToWSDLProcessor.java?view=diff&rev=539550&r1=539549&r2=539550
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/IDLToWSDLProcessor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/IDLToWSDLProcessor.java Fri May 18 11:33:55 2007
@@ -330,7 +330,7 @@
if (env.optionSet(ToolCorbaConstants.CFG_WSDL_ENCODING)) {
String encoding = env.get(ToolCorbaConstants.CFG_WSDL_ENCODING).toString();
- return fw.getWriter(new File(filename, outputDirectory), encoding);
+ return fw.getWriter(new File(outputDirectory, filename), encoding);
} else {
return fw.getWriter("", filename);
}
Modified: incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/IDLToWSDLGenerationTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/IDLToWSDLGenerationTest.java?view=diff&rev=539550&r1=539549&r2=539550
==============================================================================
--- incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/IDLToWSDLGenerationTest.java (original)
+++ incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/IDLToWSDLGenerationTest.java Fri May 18 11:33:55 2007
@@ -439,30 +439,30 @@
}
- public void testEncodingGeneration() throws Exception {
-
- try {
- String sourceIdlFilename = "/idl/Enum.idl";
- URL idl = getClass().getResource(sourceIdlFilename);
- ProcessorEnvironment env = new ProcessorEnvironment();
- Map<String, Object> cfg = new HashMap<String, Object>();
- cfg.put(ToolCorbaConstants.CFG_IDLFILE, idl.getFile());
- cfg.put(ToolCorbaConstants.CFG_WSDL_ENCODING, "UTF-16");
- env.setParameters(cfg);
- IDLToWSDLProcessor processor = new IDLToWSDLProcessor();
- processor.setEnvironment(env);
- Writer out = processor.getOutputWriter("Enum.wsdl", ".");
-
- if (out instanceof OutputStreamWriter) {
- OutputStreamWriter writer = (OutputStreamWriter)out;
- assertEquals("Encoding should be UTF-16", writer.getEncoding(),
- "UTF-16");
- }
- out.close();
- } finally {
- new File("Enum.wsdl").deleteOnExit();
- }
+ public void testEncodingGeneration() throws Exception {
+
+ try {
+ String sourceIdlFilename = "/idl/Enum.idl";
+ URL idl = getClass().getResource(sourceIdlFilename);
+ ProcessorEnvironment env = new ProcessorEnvironment();
+ Map<String, Object> cfg = new HashMap<String, Object>();
+ cfg.put(ToolCorbaConstants.CFG_IDLFILE, idl.getFile());
+ cfg.put(ToolCorbaConstants.CFG_WSDL_ENCODING, "UTF-16");
+ env.setParameters(cfg);
+ IDLToWSDLProcessor processor = new IDLToWSDLProcessor();
+ processor.setEnvironment(env);
+ Writer out = processor.getOutputWriter("Enum.wsdl", ".");
+
+ if (out instanceof OutputStreamWriter) {
+ OutputStreamWriter writer = (OutputStreamWriter)out;
+ assertEquals("Encoding should be UTF-16", writer.getEncoding(),
+ "UTF-16");
+ }
+ out.close();
+ } finally {
+ new File("Enum.wsdl").deleteOnExit();
+ }
- }
+ }
-}
\ No newline at end of file
+}