You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2022/12/15 17:52:08 UTC
[cxf] 03/03: Fix js_browser_client_java_first sample
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ea7d512f753c5db9be260f47f68fd134c013490b
Author: Daniel Kulp <da...@kulp.com>
AuthorDate: Thu Dec 15 12:51:36 2022 -0500
Fix js_browser_client_java_first sample
---
.../src/main/java/demo/hw/server/Server.java | 2 +-
.../src/main/resources/cxf.xml | 6 +++---
.../apache/cxf/javascript/JavascriptGetInterceptor.java | 16 ++++++++--------
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/Server.java b/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/Server.java
index c3111e5bb7..6b7377d839 100644
--- a/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/Server.java
+++ b/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/Server.java
@@ -34,7 +34,7 @@ public class Server {
new Server();
System.out.println("Server ready...");
- Thread.sleep(5 * 60 * 1000);
+ Thread.sleep(5 * 60 * 10000);
System.out.println("Server exiting");
System.exit(0);
}
diff --git a/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/cxf.xml b/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/cxf.xml
index cb5f700861..2c8dd3b38c 100644
--- a/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/cxf.xml
+++ b/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/cxf.xml
@@ -32,8 +32,8 @@
<property name="handler">
<bean class="org.eclipse.jetty.server.handler.ResourceHandler">
<property name="baseResource">
- <bean class="org.eclipse.jetty.util.resource.FileResource">
- <constructor-arg value="file:src/main/resources/staticContent"/>
+ <bean class="org.eclipse.jetty.util.resource.Resource" factory-method="newClassPathResource">
+ <constructor-arg value="staticContent"/>
</bean>
</property>
</bean>
@@ -48,4 +48,4 @@
<entry key="schema-validation-enabled" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptGetInterceptor.java b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptGetInterceptor.java
index bbdbfe9c9e..d92318732a 100644
--- a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptGetInterceptor.java
+++ b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptGetInterceptor.java
@@ -87,6 +87,7 @@ public class JavascriptGetInterceptor extends AbstractPhaseInterceptor<Message>
c.prepare(mout);
OutputStream os = mout.getContent(OutputStream.class);
writeResponse(uri, map, os, message.getExchange().getEndpoint());
+ message.getInterceptorChain().pause();
} catch (IOException ioe) {
throw new Fault(ioe);
}
@@ -101,20 +102,18 @@ public class JavascriptGetInterceptor extends AbstractPhaseInterceptor<Message>
}
public static void writeUtilsToResponseStream(Class<?> referenceClass, OutputStream outputStream) {
- InputStream utils = referenceClass.getResourceAsStream(JS_UTILS_PATH);
- if (utils == null) {
- throw new RuntimeException("Unable to get stream for " + JS_UTILS_PATH);
- }
- try {
- IOUtils.copyAndCloseInput(utils, outputStream);
- outputStream.flush();
+ try (InputStream utils = referenceClass.getResourceAsStream(JS_UTILS_PATH)) {
+ if (utils == null) {
+ throw new RuntimeException("Unable to get stream for " + JS_UTILS_PATH);
+ }
+ IOUtils.copy(utils, outputStream, 4096);
+ //outputStream.flush();
} catch (IOException e) {
throw new RuntimeException("Failed to write javascript utils to HTTP response.", e);
}
}
private void writeResponse(URI uri, Map<String, String> map, OutputStream os, Endpoint serverEndpoint) {
- OutputStreamWriter writer = new OutputStreamWriter(os, UTF_8);
if (!map.containsKey(NO_UTILS_QUERY_KEY)) {
writeUtilsToResponseStream(JavascriptGetInterceptor.class, os);
}
@@ -126,6 +125,7 @@ public class JavascriptGetInterceptor extends AbstractPhaseInterceptor<Message>
NamespacePrefixAccumulator prefixManager = new NamespacePrefixAccumulator(serviceInfo
.getXmlSchemaCollection());
try {
+ OutputStreamWriter writer = new OutputStreamWriter(os, UTF_8);
for (SchemaInfo schema : schemata) {
SchemaJavascriptBuilder builder = new SchemaJavascriptBuilder(serviceInfo
.getXmlSchemaCollection(), prefixManager, nameManager);