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/06/10 18:29:51 UTC
svn commit: r783415 - in /cxf/branches/2.1.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/
systests/src/test/java/org/apache/cxf/systest/http_jetty/
systests/src/test/java/org/apache/...
Author: dkulp
Date: Wed Jun 10 16:29:50 2009
New Revision: 783415
URL: http://svn.apache.org/viewvc?rev=783415&view=rev
Log:
Merged revisions 783407 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................
r783407 | dkulp | 2009-06-10 11:59:36 -0400 (Wed, 10 Jun 2009) | 9 lines
Merged revisions 783396 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r783396 | dkulp | 2009-06-10 11:34:46 -0400 (Wed, 10 Jun 2009) | 2 lines
Add missing svn properties for various things
........
................
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/MethodInvocationInfo.java (contents, props changed)
cxf/branches/2.1.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/exactly-once.xml (props changed)
cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/GreeterImpl.java (props changed)
cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/Server.java (props changed)
cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/ThreadPoolTest.java (props changed)
cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/server.xml (props changed)
cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/addressing/server.xml (props changed)
cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/exactlyonce.xml (props changed)
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 10 16:29:50 2009
@@ -1,2 +1,2 @@
-/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099
-/cxf/trunk:782181,782728-782730,783097
+/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407
+/cxf/trunk:782181,782728-782730,783097,783396
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/MethodInvocationInfo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/MethodInvocationInfo.java?rev=783415&r1=783414&r2=783415&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/MethodInvocationInfo.java (original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/MethodInvocationInfo.java Wed Jun 10 16:29:50 2009
@@ -1,51 +1,51 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.jaxrs.model;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * A triple of {@link OperationResourceInfo} representing a resource method being invoked,
- * actual {@link Class} of the object this method is invoked upon, and a list of template variable values
- * matched during the selection of this method
- */
-public class MethodInvocationInfo {
- private OperationResourceInfo ori;
- private Class<?> realClass;
- private List<String> templateValues;
-
- public MethodInvocationInfo(OperationResourceInfo ori, Class<?> realClass, List<String> templateValues) {
- this.ori = ori;
- this.realClass = realClass;
- this.templateValues = Collections.unmodifiableList(templateValues);
- }
-
- public OperationResourceInfo getMethodInfo() {
- return ori;
- }
-
- public Class<?> getRealClass() {
- return realClass;
- }
-
- public List<String> getTemplateValues() {
- return templateValues;
- }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.jaxrs.model;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * A triple of {@link OperationResourceInfo} representing a resource method being invoked,
+ * actual {@link Class} of the object this method is invoked upon, and a list of template variable values
+ * matched during the selection of this method
+ */
+public class MethodInvocationInfo {
+ private OperationResourceInfo ori;
+ private Class<?> realClass;
+ private List<String> templateValues;
+
+ public MethodInvocationInfo(OperationResourceInfo ori, Class<?> realClass, List<String> templateValues) {
+ this.ori = ori;
+ this.realClass = realClass;
+ this.templateValues = Collections.unmodifiableList(templateValues);
+ }
+
+ public OperationResourceInfo getMethodInfo() {
+ return ori;
+ }
+
+ public Class<?> getRealClass() {
+ return realClass;
+ }
+
+ public List<String> getTemplateValues() {
+ return templateValues;
+ }
+}
Propchange: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/MethodInvocationInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/MethodInvocationInfo.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/branches/2.1.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/exactly-once.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/branches/2.1.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/exactly-once.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/branches/2.1.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/exactly-once.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/GreeterImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/GreeterImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/Server.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/Server.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/ThreadPoolTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/ThreadPoolTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/server.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/server.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/addressing/server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/addressing/server.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/addressing/server.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/exactlyonce.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/exactlyonce.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/exactlyonce.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml