Author: veithen
Date: Fri Feb 18 22:27:23 2011
New Revision: 1072176

URL: http://svn.apache.org/viewvc?rev=1072176&view=rev
Log:
Removed the svn:mergeinfo properties that were copied over from the trunk when 
the 1.6 branch was created.

Modified:
    axis/axis2/java/core/branches/1_6/   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test-resources/testsuite/attribute.xsd
   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test-resources/testsuite/chameleon_include.xsd
   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test/org/apache/axis2/schema/particlemaxoccurs/
   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/   
(props changed)
    
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java
   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java
   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java
   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java
   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/WebParamAnnotation.java
   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/WebResultAnnotation.java
   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/WebServiceAnnotation.java
   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/package-info.java
   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java
   (props changed)
    axis/axis2/java/core/branches/1_6/modules/soapmonitor/module/pom.xml   
(props changed)
    
axis/axis2/java/core/branches/1_6/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
   (props changed)
    axis/axis2/java/core/branches/1_6/modules/transport/http/pom.xml   (props 
changed)
    axis/axis2/java/core/branches/1_6/modules/transport/http/src/   (props 
changed)
    axis/axis2/java/core/branches/1_6/modules/transport/local/   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/webapp/src/main/java/org/apache/axis2/transport/
   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/webapp/src/main/java/org/apache/axis2/transport/http/
   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java
   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
   (props changed)

Propchange: axis/axis2/java/core/branches/1_6/
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test-resources/testsuite/attribute.xsd
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test-resources/testsuite/chameleon_include.xsd
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test/org/apache/axis2/schema/particlemaxoccurs/
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/WebParamAnnotation.java
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/WebResultAnnotation.java
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/WebServiceAnnotation.java
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/package-info.java
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java
            ('svn:mergeinfo' removed)

Propchange: axis/axis2/java/core/branches/1_6/modules/soapmonitor/module/pom.xml
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
            ('svn:mergeinfo' removed)

Propchange: axis/axis2/java/core/branches/1_6/modules/transport/http/pom.xml
            ('svn:mergeinfo' removed)

Propchange: axis/axis2/java/core/branches/1_6/modules/transport/http/src/
            ('svn:mergeinfo' removed)

Propchange: axis/axis2/java/core/branches/1_6/modules/transport/local/
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/webapp/src/main/java/org/apache/axis2/transport/
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/webapp/src/main/java/org/apache/axis2/transport/http/
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
            ('svn:mergeinfo' removed)

Propchange: 
axis/axis2/java/core/branches/1_6/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
            ('svn:mergeinfo' removed)


Reply via email to