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 2011/07/07 16:40:12 UTC
svn commit: r1143851 - in /cxf/branches/2.3.x-fixes: ./
rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/
rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri...
Author: dkulp
Date: Thu Jul 7 14:40:12 2011
New Revision: 1143851
URL: http://svn.apache.org/viewvc?rev=1143851&view=rev
Log:
Merged revisions 1141010 via svnmerge from
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................
r1141010 | dkulp | 2011-06-29 04:54:37 -0400 (Wed, 29 Jun 2011) | 10 lines
Merged revisions 1141009 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1141009 | dkulp | 2011-06-29 04:51:27 -0400 (Wed, 29 Jun 2011) | 2 lines
Remove some svn attribute things that don't really work with GIT and
complicate various diffs and merges and such.
........
................
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSQueueEndpoint.java
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/URISupport.java
cxf/branches/2.3.x-fixes/rt/ws/policy/src/main/resources/schemas/xmldsig-core-schema.xsd
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java?rev=1143851&r1=1143850&r2=1143851&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java (original)
+++ cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java Thu Jul 7 14:40:12 2011
@@ -77,8 +77,6 @@ import org.jdom.UncheckedJDOMFactory;
* Builds a JDOM {@link org.jdom.Document org.jdom.Document} using a
* {@link javax.xml.stream.XMLStreamReader}.
*
- * @version $Revision$, $Date: 2006-02-15 15:21:25 -0500 (Wed, 15 Feb
- * 2006) $
* @author Tatu Saloranta
* @author Bradley S. Huffman
* @author Benson I. Margulies, mods for CXF to allow reading a portion of a stream.
Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java?rev=1143851&r1=1143850&r2=1143851&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java Thu Jul 7 14:40:12 2011
@@ -483,9 +483,6 @@ public final class URITemplate {
* expressions e.g. "/foo/{zipcode:[0-9]{5}}/". Nested expressions with closed sections, like open-closed
* brackets causes expression to be out of regular grammar (is context-free grammar) which are not
* supported by Java regexp version.
- *
- * @author amichalec
- * @version $Rev$
*/
static class CurlyBraceTokenizer {
Modified: cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSQueueEndpoint.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSQueueEndpoint.java?rev=1143851&r1=1143850&r2=1143851&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSQueueEndpoint.java (original)
+++ cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSQueueEndpoint.java Thu Jul 7 14:40:12 2011
@@ -23,7 +23,6 @@ package org.apache.cxf.transport.jms.uri
/**
* An endpoint for a JMS Queue which is also browsable
*
- * @version $Revision$
*/
public class JMSQueueEndpoint extends JMSEndpoint {
/**
Modified: cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/URISupport.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/URISupport.java?rev=1143851&r1=1143850&r2=1143851&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/URISupport.java (original)
+++ cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/URISupport.java Thu Jul 7 14:40:12 2011
@@ -30,7 +30,6 @@ import java.util.Map;
/**
* URI utilities.
*
- * @version $Revision$
*/
public final class URISupport {
Modified: cxf/branches/2.3.x-fixes/rt/ws/policy/src/main/resources/schemas/xmldsig-core-schema.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/policy/src/main/resources/schemas/xmldsig-core-schema.xsd?rev=1143851&r1=1143850&r2=1143851&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/ws/policy/src/main/resources/schemas/xmldsig-core-schema.xsd (original)
+++ cxf/branches/2.3.x-fixes/rt/ws/policy/src/main/resources/schemas/xmldsig-core-schema.xsd Thu Jul 7 14:40:12 2011
@@ -11,7 +11,6 @@
<!-- Schema for XML Signatures
http://www.w3.org/2000/09/xmldsig#
- $Revision$ on $Date$ by $Author: reagle $
Copyright 2001 The Internet Society and W3C (Massachusetts Institute
of Technology, Institut National de Recherche en Informatique et en