Ooops, that's clearly not true. I believe that this covers all changes made on the branch in the addressing module that we need to back-port David
On 14/11/06, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote:
Author: davidillsley Date: Tue Nov 14 04:46:17 2006 New Revision: 474770 URL: http://svn.apache.org/viewvc?view=rev&rev=474770 Log: Merge of 2 changes from the 1.1 tag back to head. I believe that this covers all changes made on the branch that we need to back-port Change 1. Add ASL block to top of AddressingFaultsHelper.java Change 2. Update maven.xml to put the mar in the correct place Modified: webservices/axis2/trunk/java/modules/addressing/maven.xml webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingFaultsHelper.java Modified: webservices/axis2/trunk/java/modules/addressing/maven.xml URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/maven.xml?view=diff&rev=474770&r1=474769&r2=474770 ============================================================================== --- webservices/axis2/trunk/java/modules/addressing/maven.xml (original) +++ webservices/axis2/trunk/java/modules/addressing/maven.xml Tue Nov 14 04:46:17 2006 @@ -23,7 +23,7 @@ <copy file="target/addressing-${addressing_version}.mar" tofile="target/modules/addressing-${addressing_version}.mar"/> <copy file="target/addressing-${addressing_version}.mar" - tofile="${maven.repo.local}/axis2/mars/addressing-${addressing_version}.mar"/> + tofile="${maven.repo.local}/org.apache.axis2/mars/addressing-${addressing_version}.mar"/> </postGoal> <preGoal name="itest:compile"> <u:file var="file" name="${maven.itest.src}"/> Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingFaultsHelper.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingFaultsHelper.java?view=diff&rev=474770&r1=474769&r2=474770 ============================================================================== --- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingFaultsHelper.java (original) +++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingFaultsHelper.java Tue Nov 14 04:46:17 2006 @@ -1,5 +1,17 @@ -/** - * +/* + * Copyright 2004,2005 The Apache Software Foundation. + * + * Licensed 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.axis2.addressing; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
-- David Illsley - IBM Web Services Development --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
