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 2009/03/12 21:21:12 UTC
svn commit: r752997 - in /cxf/branches/2.0.x-fixes: ./
common/common/src/main/java/org/apache/cxf/resource/
rt/core/src/main/java/org/apache/cxf/wsdl11/
rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/
rt/management/src/main/java/org/ap...
Author: dkulp
Date: Thu Mar 12 20:21:12 2009
New Revision: 752997
URL: http://svn.apache.org/viewvc?rev=752997&view=rev
Log:
Merged revisions 752993 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................
r752993 | dkulp | 2009-03-12 16:14:50 -0400 (Thu, 12 Mar 2009) | 13 lines
Merged revisions 752992 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r752992 | dkulp | 2009-03-12 16:10:28 -0400 (Thu, 12 Mar 2009) | 6 lines
[CXF-2110] First part of patch from Alessio Soldano applied for adding parameterOrder
[CXF-2081] Add an -J-Xmx flag to forked javac (patch from Torsten Mielke)
[CXF-2069] Unformatted service list (patch from Ted Leung applied)
[CXF-2087] If the baseUri is empty, skip doing some stuff that won't work anyway
[CXF-2084] Make AbstractMessageResponseTimeInterceptor constructor public
........
................
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 12 20:21:12 2009
@@ -1,3 +1,3 @@
-/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594,739379,739916,739920-739921,739930,740043,740190,740195,740326,740328,740959,741153-741156,741159,741163,741190,743496,743498-743499,743501-743502,743504,743512,743516,743968,744173,744181,745593,745596,745598,745600,745604-745605,745607,745639,745954,746013,746021-746022,747459,747461-747464,747466,747471,747477,747817,748248,748324,748605,748607-748608,749372,750958,750971,750973,750977,750980,750983
-750984,750986,750988,751006,751235,751238,751943,751979,752118,752142,752162,752244,752248,752563,752615,752852-752854,752856
-/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244,739367,739799-739800,739876-739877,739922,739937,740154,740186,740197,740255,740810,740844,740886,740902,740923,741124,741152,741188,741521,741529,741879,743087,743439,743441,743459,743469,743965,743967,744175,744195,744756,745214,745243,745560,745578,745586,745638,745950,746012,746019-746020,746306,746357,746373-746374,747217,747386,747406,747454,747766,748223,748305,748313,748603-748604,748768,749511,749584,749767,749771,749890,750059-750060,750591,750689,750935,751067-751110,751233,751740,751787,751828,751840,752122,752132,752136,752558,752613,752680,752728,752753,752849
+/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594,739379,739916,739920-739921,739930,740043,740190,740195,740326,740328,740959,741153-741156,741159,741163,741190,743496,743498-743499,743501-743502,743504,743512,743516,743968,744173,744181,745593,745596,745598,745600,745604-745605,745607,745639,745954,746013,746021-746022,747459,747461-747464,747466,747471,747477,747817,748248,748324,748605,748607-748608,749372,750958,750971,750973,750977,750980,750983
-750984,750986,750988,751006,751235,751238,751943,751979,752118,752142,752162,752244,752248,752563,752615,752852-752854,752856,752993
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244,739367,739799-739800,739876-739877,739922,739937,740154,740186,740197,740255,740810,740844,740886,740902,740923,741124,741152,741188,741521,741529,741879,743087,743439,743441,743459,743469,743965,743967,744175,744195,744756,745214,745243,745560,745578,745586,745638,745950,746012,746019-746020,746306,746357,746373-746374,747217,747386,747406,747454,747766,748223,748305,748313,748603-748604,748768,749511,749584,749767,749771,749890,750059-750060,750591,750689,750935,751067-751110,751233,751740,751787,751828,751840,752122,752132,752136,752558,752613,752680,752728,752753,752849,752992
/incubator/cxf/trunk:434594-651668
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java?rev=752997&r1=752996&r2=752997&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java (original)
+++ cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java Thu Mar 12 20:21:12 2009
@@ -34,6 +34,7 @@
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.util.Base64Utility;
+import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.helpers.LoadingByteArrayOutputStream;
@@ -146,7 +147,7 @@
} catch (ClassCastException ex) {
is = url.openStream();
}
- } else if (baseUriStr != null) {
+ } else if (!StringUtils.isEmpty(baseUriStr)) {
URI base;
File baseFile = new File(baseUriStr);
@@ -179,6 +180,9 @@
tryClasspath(base.toString().startsWith("file:")
? base.toString().substring(5) : base.toString());
}
+ } else {
+ tryClasspath(uriStr.startsWith("file:")
+ ? uriStr.substring(5) : uriStr);
}
} catch (URISyntaxException e) {
// do nothing
Modified: cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java?rev=752997&r1=752996&r2=752997&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java (original)
+++ cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java Thu Mar 12 20:21:12 2009
@@ -498,6 +498,7 @@
buildMessage(message, operationInfo.getInput(), def);
input.setMessage(message);
operation.setInput(input);
+ operation.setParameterOrdering(operationInfo.getParameterOrdering());
if (operationInfo.getOutput() != null) {
Output output = def.createOutput();
Modified: cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=752997&r1=752996&r2=752997&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original)
+++ cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Thu Mar 12 20:21:12 2009
@@ -36,6 +36,7 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -1177,8 +1178,7 @@
}
if (isInParam(method, j)) {
final QName q = getInParameterName(op, method, j);
- final QName q2 = getInPartName(op, method, j);
- MessagePartInfo part = inMsg.addMessagePart(q2);
+ MessagePartInfo part = inMsg.addMessagePart(getInPartName(op, method, j));
initializeParameter(part, paramClasses[j], method.getGenericParameterTypes()[j]);
if (!isWrapped(method) && !isRPC(method)) {
@@ -1263,12 +1263,40 @@
}
}
}
-
}
+
+ //setting the parameterOrder that
+ //allows preservation of method signatures
+ //when doing java->wsdl->java
+ setParameterOrder(method, paramClasses, op);
initializeFaults(intf, op, method);
}
+ private void setParameterOrder(Method method, Class[] paramClasses, OperationInfo op) {
+ if (isRPC(method)) {
+ List<String> paramOrdering = new LinkedList<String>();
+ boolean hasOut = false;
+ for (int j = 0; j < paramClasses.length; j++) {
+ if (Exchange.class.equals(paramClasses[j])) {
+ continue;
+ }
+ if (isInParam(method, j)) {
+ paramOrdering.add(getInPartName(op, method, j).getLocalPart());
+ if (isOutParam(method, j)) {
+ hasOut = true;
+ }
+ } else if (isOutParam(method, j)) {
+ hasOut = true;
+ paramOrdering.add(getOutPartName(op, method, j).getLocalPart());
+ }
+ }
+ if (!paramOrdering.isEmpty() && hasOut) {
+ op.setParameterOrdering(paramOrdering);
+ }
+ }
+ }
+
protected void createInputWrappedMessageParts(OperationInfo op, Method method, MessageInfo inMsg) {
MessagePartInfo part = inMsg.addMessagePart("parameters");
part.setIndex(0);
Modified: cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java?rev=752997&r1=752996&r2=752997&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java (original)
+++ cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java Thu Mar 12 20:21:12 2009
@@ -41,7 +41,7 @@
public abstract class AbstractMessageResponseTimeInterceptor extends AbstractPhaseInterceptor<Message> {
private static final Logger LOG = LogUtils.getL7dLogger(AbstractMessageResponseTimeInterceptor.class);
- AbstractMessageResponseTimeInterceptor(String phase) {
+ public AbstractMessageResponseTimeInterceptor(String phase) {
super(phase);
}
Modified: cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java?rev=752997&r1=752996&r2=752997&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java (original)
+++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java Thu Mar 12 20:21:12 2009
@@ -119,7 +119,14 @@
|| StringUtils.isEmpty(request.getPathInfo())
|| "/".equals(request.getPathInfo())) {
updateDests(request);
- generateServiceList(request, res);
+
+ if (request.getParameter("stylesheet") != null) {
+ renderStyleSheet(request, res);
+ } else if ("false".equals(request.getParameter("formatted"))) {
+ generateUnformattedServiceList(request, res);
+ } else {
+ generateServiceList(request, res);
+ }
} else {
d = checkRestfulRequest(request);
if (d == null || d.getMessageObserver() == null) {
@@ -185,16 +192,7 @@
}
protected void generateServiceList(HttpServletRequest request, HttpServletResponse response)
- throws IOException {
-
- if (request.getParameter("stylesheet") != null) {
- URL url = this.getClass().getResource("servicelist.css");
- if (url != null) {
- IOUtils.copy(url.openStream(), response.getOutputStream());
- }
- return;
- }
-
+ throws IOException {
response.setContentType("text/html; charset=UTF-8");
response.getWriter().write("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" "
@@ -213,15 +211,7 @@
response.getWriter().write("<title>CXF - Service list</title>");
response.getWriter().write("</head><body>");
if (!isHideServiceList) {
- List<ServletDestination> destinations
- = new LinkedList<ServletDestination>(transport.getDestinations());
- Collections.sort(destinations, new Comparator<ServletDestination>() {
- public int compare(ServletDestination o1, ServletDestination o2) {
- return o1.getEndpointInfo().getInterface().getName()
- .getLocalPart().compareTo(o2.getEndpointInfo()
- .getInterface().getName().getLocalPart());
- }
- });
+ List<ServletDestination> destinations = getServletDestinations();
if (destinations.size() > 0) {
response.getWriter().write("<span class=\"heading\">Available services:</span><br/>");
@@ -259,6 +249,46 @@
response.getWriter().write("</body></html>");
}
+ private void renderStyleSheet(HttpServletRequest request,
+ HttpServletResponse response) throws IOException {
+ response.setContentType("text/css; charset=UTF-8");
+
+ URL url = this.getClass().getResource("servicelist.css");
+ if (url != null) {
+ IOUtils.copy(url.openStream(), response.getOutputStream());
+ }
+ }
+
+ private List<ServletDestination> getServletDestinations() {
+ List<ServletDestination> destinations = new LinkedList<ServletDestination>(
+ transport.getDestinations());
+ Collections.sort(destinations, new Comparator<ServletDestination>() {
+ public int compare(ServletDestination o1, ServletDestination o2) {
+ return o1.getEndpointInfo().getInterface().getName()
+ .getLocalPart().compareTo(
+ o2.getEndpointInfo().getInterface().getName()
+ .getLocalPart());
+ }
+ });
+
+ return destinations;
+ }
+
+ protected void generateUnformattedServiceList(HttpServletRequest request,
+ HttpServletResponse response) throws IOException {
+ response.setContentType("text/plain; charset=UTF-8");
+
+ if (!isHideServiceList) {
+ List<ServletDestination> destinations = getServletDestinations();
+
+ for (ServletDestination sd : destinations) {
+ String address = sd.getEndpointInfo().getAddress();
+ response.getWriter().write(address);
+ response.getWriter().write('\n');
+ }
+ }
+ }
+
private String getBaseURL(HttpServletRequest request) {
String reqPrefix = request.getRequestURL().toString();
String pathInfo = request.getPathInfo() == null ? "" : request.getPathInfo();
Modified: cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java?rev=752997&r1=752996&r2=752997&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java (original)
+++ cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java Thu Mar 12 20:21:12 2009
@@ -42,6 +42,9 @@
public void compile(ToolContext context) throws ToolException {
List<String> argList = new ArrayList<String>();
+ //fix for CXF-2081, set maximum heap of current VM to javac.
+ argList.add("-J-Xmx" + Runtime.getRuntime().maxMemory());
+
String javaClasspath = System.getProperty("java.class.path");
// hard code cxf.jar
boolean classpathSetted = javaClasspath != null ? true : false;