Return-Path: 
 <axis-cvs-return-23910-apmail-ws-axis-dev-archive=ws.apache.org@ws.apache.org>
Delivered-To: apmail-ws-axis-dev-archive@www.apache.org
Received: (qmail 64740 invoked from network); 30 May 2007 13:48:11 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 30 May 2007 13:48:11 -0000
Received: (qmail 69358 invoked by uid 500); 30 May 2007 13:48:14 -0000
Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org
Received: (qmail 69268 invoked by uid 500); 30 May 2007 13:48:14 -0000
Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:axis-cvs-help@ws.apache.org>
list-unsubscribe: <mailto:axis-cvs-unsubscribe@ws.apache.org>
List-Post: <mailto:axis-cvs@ws.apache.org>
List-Id: <axis-cvs.ws.apache.org>
Delivered-To: mailing list axis-cvs@ws.apache.org
Received: (qmail 69257 invoked by uid 500); 30 May 2007 13:48:14 -0000
Delivered-To: apmail-ws-axis2-cvs@ws.apache.org
Received: (qmail 69254 invoked by uid 99); 30 May 2007 13:48:14 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 May 2007 06:48:14 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 May 2007 06:48:09 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id B09491A981A; Wed, 30 May 2007 06:47:49 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r542820 - in
 /webservices/axis2/branches/java/jaxws21/modules:
 adb/ clustering/src/org/apache/axis2/clustering/control/
 kernel/src/org/apache/axis2/util/ tool/axis2-eclipse-codegen-plugin/
 tool/axis2-eclipse-service-plugin/
Date: Wed, 30 May 2007 13:47:49 -0000
To: axis2-cvs@ws.apache.org
From: pradine@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070530134749.B09491A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: pradine
Date: Wed May 30 06:47:48 2007
New Revision: 542820

URL: http://svn.apache.org/viewvc?view=rev&rev=542820
Log:
Sync with the trunk to revision 542222.

Added:
    webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/AxisPolicyLocator.java
      - copied unchanged from r542222, webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/AxisPolicyLocator.java
Modified:
    webservices/axis2/branches/java/jaxws21/modules/adb/pom.xml
    webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/control/GetStateCommand.java
    webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
    webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/pom.xml

Modified: webservices/axis2/branches/java/jaxws21/modules/adb/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/pom.xml?view=diff&rev=542820&r1=542819&r2=542820
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/pom.xml Wed May 30 06:47:48 2007
@@ -15,86 +15,6 @@
  ! See the License for the specific language governing permissions and
  ! limitations under the License.
  !-->
-<<<<<<< .mine
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.axis2</groupId>
-		<artifactId>axis2-parent</artifactId>
-		<version>SNAPSHOT</version>
-		<relativePath>../parent/pom.xml</relativePath>
-	</parent>
-	<artifactId>axis2-adb</artifactId>
-	<name>Apache Axis 2.0 - Data Binding</name>
-	<description>Axis2 Data Binding module</description>
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>axis2-kernel</artifactId>
-			<version>${version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ws.commons.axiom</groupId>
-			<artifactId>axiom-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ws.commons.axiom</groupId>
-			<artifactId>axiom-impl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>xmlunit</groupId>
-			<artifactId>xmlunit</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-	<build>
-		<sourceDirectory>src</sourceDirectory>
-		<testSourceDirectory>test</testSourceDirectory>
-		<resources>
-			<resource>
-				<directory>conf</directory>
-				<excludes>
-					<exclude>**/*.properties</exclude>
-				</excludes>
-				<filtering>false</filtering>
-			</resource>
-			<resource>
-				<directory>src</directory>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<inherited>true</inherited>
-				<configuration>
-					<skip>false</skip>
-					<excludes>
-						<exclude>**/*Abstract*.java</exclude>
-						<exclude>**/*Util*.java</exclude>
-						<exclude>**/*PhaseResolvingTest.java</exclude>
-					</excludes>
-					<includes>
-						<include>**/*Test.java</include>
-					</includes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-
-
-
-
-
-
-
-
-
-
-=======
 <project
         xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -121,6 +41,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>axis2-kernel</artifactId>
+            <version>${version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
@@ -131,6 +52,15 @@
             <artifactId>axiom-impl</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-dom</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>xmlunit</groupId>
             <artifactId>xmlunit</artifactId>
             <scope>test</scope>
@@ -173,5 +103,4 @@
             </plugin>
         </plugins>
     </build>
->>>>>>> .theirs
 </project>

Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/control/GetStateCommand.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/control/GetStateCommand.java?view=diff&rev=542820&r1=542819&r2=542820
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/control/GetStateCommand.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/control/GetStateCommand.java Wed May 30 06:47:48 2007
@@ -16,6 +16,7 @@
 package org.apache.axis2.clustering.control;
 
 import org.apache.axis2.clustering.ClusteringFault;
+import org.apache.axis2.clustering.ClusterManager;
 import org.apache.axis2.clustering.context.ContextClusteringCommand;
 import org.apache.axis2.clustering.context.ContextClusteringCommandFactory;
 import org.apache.axis2.clustering.context.ContextManager;
@@ -36,13 +37,11 @@
     private ContextClusteringCommand[] commands;
 
     public void execute(ConfigurationContext configCtx) throws ClusteringFault {
-
-        //TODO: Method implementation
-        System.err.println("####### Going to send state to Member");
-
-
-        ContextManager contextManager =
-                configCtx.getAxisConfiguration().getClusterManager().getContextManager();
+        ClusterManager clusterManager = configCtx.getAxisConfiguration().getClusterManager();
+        if(clusterManager == null){
+            return;
+        }
+        ContextManager contextManager = clusterManager.getContextManager();
         if (contextManager != null) {
             Map excludedPropPatterns = contextManager.getReplicationExcludePatterns();
             List cmdList = new ArrayList();

Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?view=diff&rev=542820&r1=542819&r2=542820
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Wed May 30 06:47:48 2007
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.apache.axis2</groupId>
 		<artifactId>axis2-parent</artifactId>
-		<version>1.2-SNAPSHOT</version>
+		<version>SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>axis2.eclipse.codegen.plugin</artifactId>
@@ -139,6 +139,7 @@
 		<dependency>
 			<groupId>javax.mail</groupId>
 			<artifactId>mail</artifactId>
+			<version>${javamail.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>annogen</groupId>
@@ -298,7 +299,7 @@
 								<delete dir="./target/dist"/>
 								<mkdir dir="./target/dist"/>
 								<!--Filter tockens for the copy command to filter the versions of external dependencies -->
-								<filter token="version_number" value="1.2-SNAPSHOT"/>
+								<filter token="version_number" value="SNAPSHOT"/>
 								<filter token="activation.version" value="1.0-SNAPSHOT"/>
 								<filter token="annogen.version" value="0.1.0"/>
 								<filter token="ant.version" value="1.6.5"/>

Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/pom.xml?view=diff&rev=542820&r1=542819&r2=542820
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/pom.xml Wed May 30 06:47:48 2007
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.apache.axis2</groupId>
 		<artifactId>axis2-parent</artifactId>
-		<version>1.2-SNAPSHOT</version>
+		<version>SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>axis2.eclipse.service.plugin</artifactId>



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org