cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r890828 [1/2] - in /cxf/branches/2.1.x-fixes: ./ distribution/src/main/release/samples/aegis/ distribution/src/main/release/samples/aegis_standalone/ distribution/src/main/release/samples/callback/ distribution/src/main/release/samples/conf...
Date Tue, 15 Dec 2009 15:29:58 GMT
Author: dkulp
Date: Tue Dec 15 15:29:56 2009
New Revision: 890828

URL: http://svn.apache.org/viewvc?rev=890828&view=rev
Log:
Merged revisions 890822 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes

................
  r890822 | dkulp | 2009-12-15 10:19:47 -0500 (Tue, 15 Dec 2009) | 11 lines
  
  Merged revisions 890819 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r890819 | dkulp | 2009-12-15 10:14:04 -0500 (Tue, 15 Dec 2009) | 3 lines
    
    Update demo poms to point to nexus snapshot repo
    Move all snapshot repos into special snapshot profile
    Remove all references to java.net repo
  ........
................

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/callback/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/in_jvm_transport/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_pojo/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_spring_support/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_async/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_handlers/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jms_pubsub/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jms_queue/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/js_client/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/mtom/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/restful_dispatch/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/restful_http_binding/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/soap_header/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_addressing/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_policy/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/wsdl_first/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/wsdl_first_https/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/wsdl_first_pure_xml/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/wsdl_first_xml_wrapped/pom.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/wsdl_first_xmlbeans/pom.xml

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis/pom.xml?rev=890828&r1=890827&r2=890828&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis/pom.xml Tue Dec 15 15:29:56 2009
@@ -23,9 +23,14 @@
     <version>1.0</version>
     <name>CXF sample using code first POJO's and the Aegis Binding</name>
     <properties>
-            <cxf.version>[2,)</cxf.version>
+        <cxf.version>[2,)</cxf.version>
     </properties>
     <build>
+        <resources>
+            <resource>
+                <directory>src</directory>
+            </resource>
+        </resources>
         <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
@@ -36,7 +41,7 @@
                 </configuration>
             </plugin>
         </plugins>
-    </build>   
+    </build>
     <profiles>
         <profile>
             <id>server</id>
@@ -90,23 +95,20 @@
                 <repository>
                     <id>apache-snapshots</id>
                     <name>Apache SNAPSHOT Repository</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
-                </repository>
-                    <!-- for jaxb-impl -->
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1/</url>
-                    <layout>legacy</layout>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
                 </repository>
             </repositories>
             <pluginRepositories>
                 <pluginRepository>
-                    <id>apache-plugin-snapshots</id>
+                    <id>apache-snapshots</id>
                     <name>Apache Maven Plugin Snapshots</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <releases>
                         <enabled>false</enabled>
                     </releases>
@@ -117,14 +119,6 @@
             </pluginRepositories>
         </profile>
     </profiles>
-    <repositories>
-            <!-- for jaxb-impl -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/pom.xml?rev=890828&r1=890827&r2=890828&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/pom.xml Tue Dec 15 15:29:56 2009
@@ -23,7 +23,7 @@
     <version>1.0</version>
     <name>CXF sample using the Aegis Binding without any webservice</name>
     <properties>
-            <cxf.version>[2,)</cxf.version>
+        <cxf.version>[2,)</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -36,9 +36,9 @@
                 </configuration>
             </plugin>
         </plugins>
-    </build>   
+    </build>
     <profiles>
-      <profile>
+        <profile>
             <id>write</id>
             <build>
                 <defaultGoal>test</defaultGoal>
@@ -54,9 +54,9 @@
                                 </goals>
                                 <configuration>
                                     <mainClass>org.apache.cxf.demo.aegis.commands.WriteZoo</mainClass>
-						            <arguments>
-            							<argument>zoo.xml</argument>
-            						</arguments>
+                                    <arguments>
+                                        <argument>zoo.xml</argument>
+                                    </arguments>
                                 </configuration>
                             </execution>
                         </executions>
@@ -64,7 +64,7 @@
                 </plugins>
             </build>
         </profile>
-         <profile>
+        <profile>
             <id>read</id>
             <build>
                 <defaultGoal>test</defaultGoal>
@@ -80,9 +80,9 @@
                                 </goals>
                                 <configuration>
                                     <mainClass>org.apache.cxf.demo.aegis.commands.ReadZoo</mainClass>
-						            <arguments>
-            							<argument>zoo.xml</argument>
-            						</arguments>
+                                    <arguments>
+                                        <argument>zoo.xml</argument>
+                                    </arguments>
                                 </configuration>
                             </execution>
                         </executions>
@@ -96,23 +96,20 @@
                 <repository>
                     <id>apache-snapshots</id>
                     <name>Apache SNAPSHOT Repository</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
-                </repository>
-                    <!-- for jaxb-impl -->
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1/</url>
-                    <layout>legacy</layout>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
                 </repository>
             </repositories>
             <pluginRepositories>
                 <pluginRepository>
-                    <id>apache-plugin-snapshots</id>
+                    <id>apache-snapshots</id>
                     <name>Apache Maven Plugin Snapshots</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <releases>
                         <enabled>false</enabled>
                     </releases>
@@ -123,30 +120,22 @@
             </pluginRepositories>
         </profile>
     </profiles>
-    <repositories>
-            <!-- for jaxb-impl -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-databinding-aegis</artifactId>
             <version>${cxf.version}</version>
         </dependency>
-	<dependency>
-	  <groupId>net.java.dev.stax-utils</groupId>
-	  <artifactId>stax-utils</artifactId>
-	  <version>20060502</version>
-	  <exclusions>
-	    <exclusion>
-	      <groupId>com.bea.xml</groupId>
-	      <artifactId>jsr173-ri</artifactId>
-	    </exclusion>
-	  </exclusions>
-	</dependency>
+        <dependency>
+            <groupId>net.java.dev.stax-utils</groupId>
+            <artifactId>stax-utils</artifactId>
+            <version>20060502</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.bea.xml</groupId>
+                    <artifactId>jsr173-ri</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 </project>

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/callback/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/callback/pom.xml?rev=890828&r1=890827&r2=890828&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/callback/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/callback/pom.xml Tue Dec 15 15:29:56 2009
@@ -23,7 +23,7 @@
     <version>1.0</version>
     <name>CXF sample using a callbak object</name>
     <properties>
-            <cxf.version>[2,)</cxf.version>
+        <cxf.version>[2,)</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -79,25 +79,26 @@
                 </executions>
             </plugin>
             <plugin>
-	        <artifactId>maven-antrun-plugin</artifactId>
-	        <executions>
-	            <execution>
-	                <id>prepare-transform</id>
-	                <phase>generate-sources</phase>
-	                <goals>
-	                    <goal>run</goal>
-	                </goals>
-	                <configuration>
-	                    <tasks>
-	                        <copy file="${basedir}/src/demo/callback/client/callback_infoset.xml" todir="${basedir}/target/classes/demo/callback/client"/>
-	                    </tasks>
-	                </configuration>
-	            </execution>
-	        </executions>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>prepare-transform</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <copy file="${basedir}/src/demo/callback/client/callback_infoset.xml" todir="${basedir}/target/classes/demo/callback/client"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
-    </build>   
+    </build>
     
+
     <profiles>
         <profile>
             <id>server</id>
@@ -116,7 +117,7 @@
                                 <configuration>
                                     <mainClass>demo.callback.server.Server</mainClass>
                                     <arguments>
-				        <argument>${basedir}/wsdl/basic_callback.wsdl</argument>
+                                        <argument>${basedir}/wsdl/basic_callback.wsdl</argument>
                                     </arguments>
                                 </configuration>
                             </execution>
@@ -140,10 +141,10 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>java</executable>  
+                                    <executable>java</executable>
                                     <arguments>
                                         <argument>-classpath</argument>
-					<classpath/>
+                                        <classpath/>
                                         <argument>demo.callback.client.Client</argument>
                                         <argument>${basedir}/wsdl/basic_callback.wsdl</argument>
                                     </arguments>
@@ -155,47 +156,35 @@
             </build>
         </profile>
         <profile>
-        <id>snapshots</id>
+            <id>snapshots</id>
             <repositories>
                 <repository>
                     <id>apache-snapshots</id>
                     <name>Apache SNAPSHOT Repository</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
                 </repository>
-                <!-- for jaxb-impl -->
-	        <repository>
-	            <id>java.net</id>
-	            <url>http://download.java.net/maven/1/</url>
-	            <layout>legacy</layout>
-	        </repository>
-	    </repositories>
-	    <pluginRepositories>
-	        <pluginRepository>
-	            <id>apache-plugin-snapshots</id>
-	            <name>Apache Maven Plugin Snapshots</name>
-	            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-	            <releases>
-	                <enabled>false</enabled>
-	            </releases>
-	            <snapshots>
-	                <enabled>true</enabled>
-	            </snapshots>
-	        </pluginRepository>
-	    </pluginRepositories>
+            </repositories>
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>apache-snapshots</id>
+                    <name>Apache Maven Plugin Snapshots</name>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
+                    <snapshots>
+                        <enabled>true</enabled>
+                    </snapshots>
+                </pluginRepository>
+            </pluginRepositories>
         </profile>
     </profiles>
-    <repositories>
-            <!-- for jaxb-impl -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/pom.xml?rev=890828&r1=890827&r2=890828&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/pom.xml Tue Dec 15 15:29:56 2009
@@ -31,7 +31,7 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.5</source> 
+                    <source>1.5</source>
                     <target>1.5</target>
                 </configuration>
             </plugin>
@@ -54,29 +54,29 @@
                             <goal>wsdl2java</goal>
                         </goals>
                     </execution>
-               </executions>
-           </plugin>
-           <plugin>
+                </executions>
+            </plugin>
+            <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
                         <id>copyxmlfiles</id>
                         <phase>generate-sources</phase>
-	    	        <goals>
-	    	            <goal>run</goal>
-	    	        </goals>
-	    	        <configuration>
-	    	            <tasks>
-	    	               <copy file="${basedir}/client.xml" todir="${basedir}/target/classes/demo/stream/client"/>
-	    	               <copy file="${basedir}/server.xml" todir="${basedir}/target/classes/demo/stream/server"/>
-	    	               <copy file="${basedir}/wsdl/hello_world.wsdl" todir="${basedir}/target/classes/demo/stream/client"/>
-	    	            </tasks>
-	    	        </configuration>
-	    	    </execution>
-	    	</executions>
-            </plugin>           
-       </plugins>
-    </build>   
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <copy file="${basedir}/client.xml" todir="${basedir}/target/classes/demo/stream/client"/>
+                                <copy file="${basedir}/server.xml" todir="${basedir}/target/classes/demo/stream/server"/>
+                                <copy file="${basedir}/wsdl/hello_world.wsdl" todir="${basedir}/target/classes/demo/stream/client"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
     <profiles>
         <profile>
             <id>server</id>
@@ -95,7 +95,7 @@
                                 <configuration>
                                     <executable>java</executable>
                                     <arguments>
-				        <argument>-Dcxf.config.file=${basedir}/src/demo/stream/server/server.xml</argument>
+                                        <argument>-Dcxf.config.file=${basedir}/src/demo/stream/server/server.xml</argument>
                                         <argument>-classpath</argument>
                                         <classpath/>
                                         <argument>demo.stream.server.Server</argument>
@@ -122,60 +122,50 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                   <executable>java</executable>
+                                    <executable>java</executable>
                                     <arguments>
                                         <argument>-Dcxf.config.file=${basedir}/src/demo/stream/client/client.xml</argument>
                                         <argument>-classpath</argument>
                                         <classpath/>
                                         <argument>demo.stream.client.Client</argument>
-                                   </arguments>
-                               </configuration>
-                           </execution>
-                       </executions>
-                   </plugin>
-               </plugins>
-           </build>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
+        <profile>
+             <id>snapshots</id>
+             <repositories>
+                 <repository>
+                     <id>apache-snapshots</id>
+                     <name>Apache SNAPSHOT Repository</name>
+                     <url>https://repository.apache.org/content/groups/snapshots-group/</url>
+                     <snapshots>
+                         <enabled>true</enabled>
+                     </snapshots>
+                     <releases>
+                         <enabled>false</enabled>
+                     </releases>
+                 </repository>
+             </repositories>
+             <pluginRepositories>
+                 <pluginRepository>
+                     <id>apache-snapshots</id>
+                     <name>Apache Maven Plugin Snapshots</name>
+                     <url>https://repository.apache.org/content/groups/snapshots-group/</url>
+                     <releases>
+                         <enabled>false</enabled>
+                     </releases>
+                     <snapshots>
+                         <enabled>true</enabled>
+                     </snapshots>
+                 </pluginRepository>
+             </pluginRepositories>
+         </profile>
     </profiles>
-    <repositories>
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache SNAPSHOT Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-	    <id>apache-incubating</id>
-	    <name>Apache Incubating Repository</name>
-	    <url>http://people.apache.org/repo/m2-incubating-repository/</url>
-	</repository>
-	<!-- for jaxb-impl -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>apache-plugin-snapshots</id>
-            <name>Apache Maven Plugin Snapshots</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>apache-plugin-incubating</id>
-            <name>Apache Plugin Incubating Repository</name>
-            <url>http://people.apache.org/repo/m2-incubating-repository/</url>
-        </pluginRepository>
-    </pluginRepositories>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -188,15 +178,15 @@
             <version>${cxf.version}</version>
         </dependency>
         <dependency>
-             <groupId>org.apache.cxf</groupId>
-             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-             <version>${cxf.version}</version>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http-jetty</artifactId>
+            <version>${cxf.version}</version>
         </dependency>
         <dependency>
-             <groupId>org.apache.cxf</groupId>
-             <artifactId>cxf-rt-management</artifactId>
-             <version>${cxf.version}</version>
-       </dependency>
-   </dependencies>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-management</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+    </dependencies>
 </project>
 

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/in_jvm_transport/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/in_jvm_transport/pom.xml?rev=890828&r1=890827&r2=890828&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/in_jvm_transport/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/in_jvm_transport/pom.xml Tue Dec 15 15:29:56 2009
@@ -57,7 +57,7 @@
                 </executions>
             </plugin>
         </plugins>
-    </build>   
+    </build>
     <profiles>
         <profile>
             <id>client</id>
@@ -91,23 +91,20 @@
                 <repository>
                     <id>apache-snapshots</id>
                     <name>Apache SNAPSHOT Repository</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
-                </repository>
-                    <!-- for jaxb-impl -->
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1/</url>
-                    <layout>legacy</layout>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
                 </repository>
             </repositories>
             <pluginRepositories>
                 <pluginRepository>
-                    <id>apache-plugin-snapshots</id>
+                    <id>apache-snapshots</id>
                     <name>Apache Maven Plugin Snapshots</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <releases>
                         <enabled>false</enabled>
                     </releases>
@@ -118,15 +115,6 @@
             </pluginRepositories>
         </profile>
     </profiles>
-    <repositories>
-        <!-- for jaxb-impl -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
-    
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml?rev=890828&r1=890827&r2=890828&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml Tue Dec 15 15:29:56 2009
@@ -23,7 +23,7 @@
     <version>1.0</version>
     <name>Java First demo using JAX-WS APIs</name>
     <properties>
-            <cxf.version>[2,)</cxf.version>
+        <cxf.version>[2,)</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -36,7 +36,7 @@
                 </configuration>
             </plugin>
         </plugins>
-    </build>   
+    </build>
     <profiles>
         <profile>
             <id>server</id>
@@ -90,23 +90,20 @@
                 <repository>
                     <id>apache-snapshots</id>
                     <name>Apache SNAPSHOT Repository</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
-                </repository>
-                    <!-- for jaxb-impl -->
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1/</url>
-                    <layout>legacy</layout>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
                 </repository>
             </repositories>
             <pluginRepositories>
                 <pluginRepository>
-                    <id>apache-plugin-snapshots</id>
+                    <id>apache-snapshots</id>
                     <name>Apache Maven Plugin Snapshots</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <releases>
                         <enabled>false</enabled>
                     </releases>
@@ -117,14 +114,6 @@
             </pluginRepositories>
         </profile>
     </profiles>
-    <repositories>
-            <!-- for jaxb-impl -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_pojo/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_pojo/pom.xml?rev=890828&r1=890827&r2=890828&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_pojo/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_pojo/pom.xml Tue Dec 15 15:29:56 2009
@@ -23,7 +23,7 @@
     <version>1.0</version>
     <name>Java First POJO Sample</name>
     <properties>
-            <cxf.version>[2,)</cxf.version>
+        <cxf.version>[2,)</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -36,7 +36,7 @@
                 </configuration>
             </plugin>
         </plugins>
-    </build>   
+    </build>
     <profiles>
         <profile>
             <id>server</id>
@@ -90,23 +90,20 @@
                 <repository>
                     <id>apache-snapshots</id>
                     <name>Apache SNAPSHOT Repository</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
-                </repository>
-                    <!-- for jaxb-impl -->
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1/</url>
-                    <layout>legacy</layout>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
                 </repository>
             </repositories>
             <pluginRepositories>
                 <pluginRepository>
-                    <id>apache-plugin-snapshots</id>
+                    <id>apache-snapshots</id>
                     <name>Apache Maven Plugin Snapshots</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <releases>
                         <enabled>false</enabled>
                     </releases>
@@ -117,14 +114,6 @@
             </pluginRepositories>
         </profile>
     </profiles>
-    <repositories>
-            <!-- for jaxb-impl -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_spring_support/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_spring_support/pom.xml?rev=890828&r1=890827&r2=890828&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_spring_support/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_spring_support/pom.xml Tue Dec 15 15:29:56 2009
@@ -23,7 +23,7 @@
     <version>1.0</version>
     <name>Spring HTTP Sample</name>
     <properties>
-            <cxf.version>[2,)</cxf.version>
+        <cxf.version>[2,)</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -47,13 +47,13 @@
                         <configuration>
                             <tasks>
                                 <copy file="${basedir}/src/demo/spring/client/client-beans.xml" todir="${basedir}/target/classes/demo/spring/client"/>
-	    	            </tasks>
-	    	        </configuration>
-	    	    </execution>
+                            </tasks>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>
-    </build>   
+    </build>
     <profiles>
         <profile>
             <id>server</id>
@@ -107,23 +107,20 @@
                 <repository>
                     <id>apache-snapshots</id>
                     <name>Apache SNAPSHOT Repository</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
-                </repository>
-                    <!-- for jaxb-impl -->
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1/</url>
-                    <layout>legacy</layout>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
                 </repository>
             </repositories>
             <pluginRepositories>
                 <pluginRepository>
-                    <id>apache-plugin-snapshots</id>
+                    <id>apache-snapshots</id>
                     <name>Apache Maven Plugin Snapshots</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <releases>
                         <enabled>false</enabled>
                     </releases>
@@ -134,14 +131,6 @@
             </pluginRepositories>
         </profile>
     </profiles>
-    <repositories>
-            <!-- for jaxb-impl -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/pom.xml?rev=890828&r1=890827&r2=890828&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/pom.xml Tue Dec 15 15:29:56 2009
@@ -23,9 +23,9 @@
     <version>1.0</version>
     <name>JAX-RS Basic Demo</name>
     <properties>
-            <cxf.version>[2,)</cxf.version>
-            <httpclient.version>3.1</httpclient.version>
-            <jsr311.version>0.8</jsr311.version>
+        <cxf.version>[2,)</cxf.version>
+        <httpclient.version>3.1</httpclient.version>
+        <jsr311.version>0.8</jsr311.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -43,20 +43,20 @@
                     <execution>
                         <id>copyxmlfiles</id>
                         <phase>generate-sources</phase>
-	    	        <goals>
-	    	            <goal>run</goal>
-	    	        </goals>
-	    	        <configuration>
-	    	            <tasks>
-	    	               <copy file="${basedir}/src/demo/jaxrs/client/add_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client"/>
-	    	               <copy file="${basedir}/src/demo/jaxrs/client/update_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client"/>
-	    	            </tasks>
-	    	        </configuration>
-	    	    </execution>
-	    	</executions>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <copy file="${basedir}/src/demo/jaxrs/client/add_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client"/>
+                                <copy file="${basedir}/src/demo/jaxrs/client/update_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
-    </build>   
+    </build>
     <profiles>
         <profile>
             <id>server</id>
@@ -110,23 +110,20 @@
                 <repository>
                     <id>apache-snapshots</id>
                     <name>Apache SNAPSHOT Repository</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
-                </repository>
-                    <!-- for jaxb-impl -->
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1/</url>
-                    <layout>legacy</layout>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
                 </repository>
             </repositories>
             <pluginRepositories>
                 <pluginRepository>
-                    <id>apache-plugin-snapshots</id>
+                    <id>apache-snapshots</id>
                     <name>Apache Maven Plugin Snapshots</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <releases>
                         <enabled>false</enabled>
                     </releases>
@@ -137,14 +134,6 @@
             </pluginRepositories>
         </profile>
     </profiles>
-    <repositories>
-            <!-- for jaxb-impl -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml?rev=890828&r1=890827&r2=890828&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml Tue Dec 15 15:29:56 2009
@@ -23,14 +23,14 @@
     <name>JAX-RS Basic Demo With HTTPS communications</name>
     <version>1.0</version>
     <properties>
-            <cxf.version>[2,)</cxf.version>
-            <httpclient.version>3.1</httpclient.version>
-            <jsr311.version>0.8</jsr311.version>
+        <cxf.version>[2,)</cxf.version>
+        <httpclient.version>3.1</httpclient.version>
+        <jsr311.version>0.8</jsr311.version>
     </properties>
 
     <build>
-         <sourceDirectory>src</sourceDirectory>
-         <plugins>
+        <sourceDirectory>src</sourceDirectory>
+        <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
@@ -44,42 +44,42 @@
                     <execution>
                         <id>copyResources</id>
                         <phase>generate-sources</phase>
-	    	        <goals>
-	    	            <goal>run</goal>
-	    	        </goals>
-	    	        <configuration>
-	    	            <tasks>
-	    	               <copy file="${basedir}/src/demo/jaxrs/client/add_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client"/>
-	    	               <copy file="${basedir}/src/demo/jaxrs/client/update_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client"/>
-                               <copy file="${basedir}/CherryServer.xml" todir="${basedir}/target/classes"/>
-                               <copy todir="${basedir}/src">
-                                  <fileset dir="${basedir}/contrib">
-                                     <include name="*.java"/> 
-                                  </fileset>
-                               </copy>
-	    	            </tasks>
-	    	        </configuration>
-	    	    </execution>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <copy file="${basedir}/src/demo/jaxrs/client/add_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client"/>
+                                <copy file="${basedir}/src/demo/jaxrs/client/update_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client"/>
+                                <copy file="${basedir}/CherryServer.xml" todir="${basedir}/target/classes"/>
+                                <copy todir="${basedir}/src">
+                                    <fileset dir="${basedir}/contrib">
+                                        <include name="*.java"/>
+                                    </fileset>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
                     <execution>
                         <id>removeContribFromSrc</id>
                         <phase>process-classes</phase>
-	    	        <goals>
-	    	            <goal>run</goal>
-	    	        </goals>
-	    	        <configuration>
-	    	            <tasks>
-	    	               <delete>
-                                   <fileset dir="${basedir}/src">
-                                     <include name="*.java"/> 
-                                  </fileset> 
-                               </delete>
-	    	            </tasks>
-	    	        </configuration>
-	    	    </execution>
- 	    	</executions>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <delete>
+                                    <fileset dir="${basedir}/src">
+                                        <include name="*.java"/>
+                                    </fileset>
+                                </delete>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
-    </build>   
+    </build>
     <profiles>
         <profile>
             <id>server</id>
@@ -99,10 +99,10 @@
                                     <mainClass>demo.jaxrs.server.Server</mainClass>
                                     <systemProperties>
                                         <property>
-                                           <key>cxf.config.file</key>
-                                           <value>CherryServer.xml</value>
-                                         </property>
-                                    </systemProperties> 
+                                            <key>cxf.config.file</key>
+                                            <value>CherryServer.xml</value>
+                                        </property>
+                                    </systemProperties>
                                 </configuration>
                             </execution>
                         </executions>
@@ -126,10 +126,10 @@
                                 </goals>
                                 <configuration>
                                     <mainClass>demo.jaxrs.client.Client</mainClass>
-                                    <arguments>  
-                                      <argument>${basedir}/certs/wibble.jks</argument> 
-                                      <argument>${basedir}/certs/truststore.jks</argument> 
-                                    </arguments> 
+                                    <arguments>
+                                        <argument>${basedir}/certs/wibble.jks</argument>
+                                        <argument>${basedir}/certs/truststore.jks</argument>
+                                    </arguments>
                                 </configuration>
                             </execution>
                         </executions>
@@ -143,23 +143,20 @@
                 <repository>
                     <id>apache-snapshots</id>
                     <name>Apache SNAPSHOT Repository</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
-                </repository>
-                    <!-- for jaxb-impl -->
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1/</url>
-                    <layout>legacy</layout>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
                 </repository>
             </repositories>
             <pluginRepositories>
                 <pluginRepository>
-                    <id>apache-plugin-snapshots</id>
+                    <id>apache-snapshots</id>
                     <name>Apache Maven Plugin Snapshots</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <releases>
                         <enabled>false</enabled>
                     </releases>
@@ -170,14 +167,6 @@
             </pluginRepositories>
         </profile>
     </profiles>
-    <repositories>
-            <!-- for jaxb-impl -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml?rev=890828&r1=890827&r2=890828&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml Tue Dec 15 15:29:56 2009
@@ -22,9 +22,9 @@
     <artifactId>jax_rs_content_negotiation</artifactId>
     <version>0.8</version>
     <properties>
-            <cxf.version>[2,)</cxf.version>
-            <httpclient.version>3.1</httpclient.version>
-            <jsr311.version>0.8</jsr311.version>
+        <cxf.version>[2,)</cxf.version>
+        <httpclient.version>3.1</httpclient.version>
+        <jsr311.version>0.8</jsr311.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -37,7 +37,7 @@
                 </configuration>
             </plugin>
         </plugins>
-    </build>   
+    </build>
     <profiles>
         <profile>
             <id>server</id>
@@ -91,23 +91,20 @@
                 <repository>
                     <id>apache-snapshots</id>
                     <name>Apache SNAPSHOT Repository</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
-                </repository>
-                    <!-- for jaxb-impl -->
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1/</url>
-                    <layout>legacy</layout>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
                 </repository>
             </repositories>
             <pluginRepositories>
                 <pluginRepository>
-                    <id>apache-plugin-snapshots</id>
+                    <id>apache-snapshots</id>
                     <name>Apache Maven Plugin Snapshots</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <releases>
                         <enabled>false</enabled>
                     </releases>
@@ -118,14 +115,6 @@
             </pluginRepositories>
         </profile>
     </profiles>
-    <repositories>
-            <!-- for jaxb-impl -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml?rev=890828&r1=890827&r2=890828&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml Tue Dec 15 15:29:56 2009
@@ -90,23 +90,20 @@
                 <repository>
                     <id>apache-snapshots</id>
                     <name>Apache SNAPSHOT Repository</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
-                </repository>
-                    <!-- for jaxb-impl -->
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1/</url>
-                    <layout>legacy</layout>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
                 </repository>
             </repositories>
             <pluginRepositories>
                 <pluginRepository>
-                    <id>apache-plugin-snapshots</id>
+                    <id>apache-snapshots</id>
                     <name>Apache Maven Plugin Snapshots</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <releases>
                         <enabled>false</enabled>
                     </releases>
@@ -117,14 +114,6 @@
             </pluginRepositories>
         </profile>
     </profiles>
-    <repositories>
-            <!-- for jaxb-impl -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_async/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_async/pom.xml?rev=890828&r1=890827&r2=890828&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_async/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_async/pom.xml Tue Dec 15 15:29:56 2009
@@ -23,7 +23,7 @@
     <version>1.0</version>
     <name>JAX-WS Asynchronous Demo using Document/Literal Style</name>
     <properties>
-            <cxf.version>[2,)</cxf.version>
+        <cxf.version>[2,)</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -61,7 +61,7 @@
                 </executions>
             </plugin>
         </plugins>
-    </build>   
+    </build>
     <profiles>
         <profile>
             <id>server</id>
@@ -121,23 +121,20 @@
                 <repository>
                     <id>apache-snapshots</id>
                     <name>Apache SNAPSHOT Repository</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
-                </repository>
-                    <!-- for jaxb-impl -->
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1/</url>
-                    <layout>legacy</layout>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
                 </repository>
             </repositories>
             <pluginRepositories>
                 <pluginRepository>
-                    <id>apache-plugin-snapshots</id>
+                    <id>apache-snapshots</id>
                     <name>Apache Maven Plugin Snapshots</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <releases>
                         <enabled>false</enabled>
                     </releases>
@@ -148,14 +145,6 @@
             </pluginRepositories>
         </profile>
     </profiles>
-    <repositories>
-            <!-- for jaxb-impl -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml?rev=890828&r1=890827&r2=890828&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml Tue Dec 15 15:29:56 2009
@@ -88,7 +88,7 @@
                                         <extraarg>SOAPService3</extraarg>
                                     </extraargs>
                                 </wsdlOption>
-                             </wsdlOptions>
+                            </wsdlOptions>
                         </configuration>
                         <goals>
                             <goal>wsdl2java</goal>
@@ -102,25 +102,27 @@
                     <execution>
                         <id>copyxmlfiles</id>
                         <phase>generate-sources</phase>
-	    	        <goals>
-	    	            <goal>run</goal>
-	    	        </goals>
-	    	        <configuration>
-	    	            <tasks>
-	    	               <copy file="${basedir}/src/demo/hwDispatch/client/GreetMeDocLiteralReq1.xml" todir="${basedir}/target/classes/demo/hwDispatch/client"/>
-	    	               <copy file="${basedir}/src/demo/hwDispatch/client/GreetMeDocLiteralReq2.xml" todir="${basedir}/target/classes/demo/hwDispatch/client"/>
-	    	               <copy file="${basedir}/src/demo/hwDispatch/client/GreetMeDocLiteralReq3.xml" todir="${basedir}/target/classes/demo/hwDispatch/client"/>
-	    	               <copy file="${basedir}/src/demo/hwDispatch/server/GreetMeDocLiteralResp1.xml" todir="${basedir}/target/classes/demo/hwDispatch/server"/>
-			       <copy file="${basedir}/src/demo/hwDispatch/server/GreetMeDocLiteralResp2.xml" todir="${basedir}/target/classes/demo/hwDispatch/server"/>
-			       <copy file="${basedir}/src/demo/hwDispatch/server/GreetMeDocLiteralResp3.xml" todir="${basedir}/target/classes/demo/hwDispatch/server"/>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <copy file="${basedir}/src/demo/hwDispatch/client/GreetMeDocLiteralReq1.xml" todir="${basedir}/target/classes/demo/hwDispatch/client"/>
+                                <copy file="${basedir}/src/demo/hwDispatch/client/GreetMeDocLiteralReq2.xml" todir="${basedir}/target/classes/demo/hwDispatch/client"/>
+                                <copy file="${basedir}/src/demo/hwDispatch/client/GreetMeDocLiteralReq3.xml" todir="${basedir}/target/classes/demo/hwDispatch/client"/>
+                                <copy file="${basedir}/src/demo/hwDispatch/server/GreetMeDocLiteralResp1.xml" todir="${basedir}/target/classes/demo/hwDispatch/server"/>
+                                <copy file="${basedir}/src/demo/hwDispatch/server/GreetMeDocLiteralResp2.xml" todir="${basedir}/target/classes/demo/hwDispatch/server"/>
+                                <copy file="${basedir}/src/demo/hwDispatch/server/GreetMeDocLiteralResp3.xml" todir="${basedir}/target/classes/demo/hwDispatch/server"/>
 	    	            
-	    	            </tasks>
-	    	        </configuration>
-	    	    </execution>
-	    	</executions>
+
+
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
-    </build>   
+    </build>
     <profiles>
         <profile>
             <id>server</id>
@@ -139,7 +141,7 @@
                                 <configuration>
                                     <mainClass>demo.hwDispatch.server.Server</mainClass>
                                     <arguments>
-				        <argument>${basedir}/wsdl/hello_world.wsdl</argument>
+                                        <argument>${basedir}/wsdl/hello_world.wsdl</argument>
                                     </arguments>
                                 </configuration>
                             </execution>
@@ -180,23 +182,20 @@
                 <repository>
                     <id>apache-snapshots</id>
                     <name>Apache SNAPSHOT Repository</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
-                </repository>
-                    <!-- for jaxb-impl -->
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1/</url>
-                    <layout>legacy</layout>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
                 </repository>
             </repositories>
             <pluginRepositories>
                 <pluginRepository>
-                    <id>apache-plugin-snapshots</id>
+                    <id>apache-snapshots</id>
                     <name>Apache Maven Plugin Snapshots</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <releases>
                         <enabled>false</enabled>
                     </releases>
@@ -207,14 +206,6 @@
             </pluginRepositories>
         </profile>
     </profiles>
-    <repositories>
-        <!-- for jaxb-impl -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_handlers/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_handlers/pom.xml?rev=890828&r1=890827&r2=890828&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_handlers/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_handlers/pom.xml Tue Dec 15 15:29:56 2009
@@ -134,23 +134,20 @@
                 <repository>
                     <id>apache-snapshots</id>
                     <name>Apache SNAPSHOT Repository</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
-                </repository>
-                    <!-- for jaxb-impl -->
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1/</url>
-                    <layout>legacy</layout>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
                 </repository>
             </repositories>
             <pluginRepositories>
                 <pluginRepository>
-                    <id>apache-plugin-snapshots</id>
+                    <id>apache-snapshots</id>
                     <name>Apache Maven Plugin Snapshots</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <releases>
                         <enabled>false</enabled>
                     </releases>
@@ -161,14 +158,6 @@
             </pluginRepositories>
         </profile>
     </profiles>
-    <repositories>
-        <!-- for jaxb-impl -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jms_pubsub/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jms_pubsub/pom.xml?rev=890828&r1=890827&r2=890828&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jms_pubsub/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jms_pubsub/pom.xml Tue Dec 15 15:29:56 2009
@@ -58,7 +58,7 @@
                 </executions>
             </plugin>
         </plugins>
-    </build>   
+    </build>
     <profiles>
         <profile>
             <id>server</id>
@@ -141,23 +141,20 @@
                 <repository>
                     <id>apache-snapshots</id>
                     <name>Apache SNAPSHOT Repository</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
-                </repository>
-                    <!-- for jaxb-impl -->
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1/</url>
-                    <layout>legacy</layout>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
                 </repository>
             </repositories>
             <pluginRepositories>
                 <pluginRepository>
-                    <id>apache-plugin-snapshots</id>
+                    <id>apache-snapshots</id>
                     <name>Apache Maven Plugin Snapshots</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <releases>
                         <enabled>false</enabled>
                     </releases>
@@ -168,15 +165,6 @@
             </pluginRepositories>
         </profile>
     </profiles>
-    <repositories>
-        <!-- for jaxb-impl -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
-    
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jms_queue/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jms_queue/pom.xml?rev=890828&r1=890827&r2=890828&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jms_queue/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jms_queue/pom.xml Tue Dec 15 15:29:56 2009
@@ -58,7 +58,7 @@
                 </executions>
             </plugin>
         </plugins>
-    </build>   
+    </build>
     <profiles>
         <profile>
             <id>server</id>
@@ -141,23 +141,20 @@
                 <repository>
                     <id>apache-snapshots</id>
                     <name>Apache SNAPSHOT Repository</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
-                </repository>
-                    <!-- for jaxb-impl -->
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1/</url>
-                    <layout>legacy</layout>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
                 </repository>
             </repositories>
             <pluginRepositories>
                 <pluginRepository>
-                    <id>apache-plugin-snapshots</id>
+                    <id>apache-snapshots</id>
                     <name>Apache Maven Plugin Snapshots</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <releases>
                         <enabled>false</enabled>
                     </releases>
@@ -168,15 +165,6 @@
             </pluginRepositories>
         </profile>
     </profiles>
-    <repositories>
-        <!-- for jaxb-impl -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
-    
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml?rev=890828&r1=890827&r2=890828&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml Tue Dec 15 15:29:56 2009
@@ -23,7 +23,7 @@
     <version>1.0</version>
     <name>Generated JavaScript Sample using JAX-WS and JSR-181</name>
     <properties>
-            <cxf.version>[2,)</cxf.version>
+        <cxf.version>[2,)</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -41,20 +41,20 @@
                     <execution>
                         <id>copyxmlfiles</id>
                         <phase>generate-sources</phase>
-	    	        <goals>
-	    	            <goal>run</goal>
-	    	        </goals>
-	    	        <configuration>
-	    	            <tasks>
-	    	               <copy file="${basedir}/staticContent/beverages.html" todir="${basedir}/target/classes/staticContent"/>
-	    	               <copy file="${basedir}/cxf.xml" todir="${basedir}/target/classes/"/>
-	    	            </tasks>
-	    	        </configuration>
-	    	    </execution>
-	    	</executions>
-            </plugin>            
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <copy file="${basedir}/staticContent/beverages.html" todir="${basedir}/target/classes/staticContent"/>
+                                <copy file="${basedir}/cxf.xml" todir="${basedir}/target/classes/"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
-    </build>   
+    </build>
     <profiles>
         <profile>
             <id>server</id>
@@ -85,23 +85,20 @@
                 <repository>
                     <id>apache-snapshots</id>
                     <name>Apache SNAPSHOT Repository</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
-                </repository>
-                    <!-- for jaxb-impl -->
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1/</url>
-                    <layout>legacy</layout>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
                 </repository>
             </repositories>
             <pluginRepositories>
                 <pluginRepository>
-                    <id>apache-plugin-snapshots</id>
+                    <id>apache-snapshots</id>
                     <name>Apache Maven Plugin Snapshots</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <releases>
                         <enabled>false</enabled>
                     </releases>
@@ -112,14 +109,6 @@
             </pluginRepositories>
         </profile>
     </profiles>
-    <repositories>
-            <!-- for jaxb-impl -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/js_browser_client_simple/pom.xml?rev=890828&r1=890827&r2=890828&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/js_browser_client_simple/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/js_browser_client_simple/pom.xml Tue Dec 15 15:29:56 2009
@@ -23,7 +23,7 @@
     <version>1.0</version>
     <name>JavaScript Client Demo using Document/Literal Style</name>
     <properties>
-            <cxf.version>[2,)</cxf.version>
+        <cxf.version>[2,)</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -62,20 +62,20 @@
                     <execution>
                         <id>copyxmlfiles</id>
                         <phase>generate-sources</phase>
-	    	        <goals>
-	    	            <goal>run</goal>
-	    	        </goals>
-	    	        <configuration>
-	    	            <tasks>
-	    	               <copy file="${basedir}/staticContent/HelloWorld.html" todir="${basedir}/target/classes/staticContent"/>
-	    	               <copy file="${basedir}/cxf.xml" todir="${basedir}/target/classes/"/>
-	    	            </tasks>
-	    	        </configuration>
-	    	    </execution>
-	    	</executions>
-            </plugin>            
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <copy file="${basedir}/staticContent/HelloWorld.html" todir="${basedir}/target/classes/staticContent"/>
+                                <copy file="${basedir}/cxf.xml" todir="${basedir}/target/classes/"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
-    </build>   
+    </build>
     <profiles>
         <profile>
             <id>server</id>
@@ -132,23 +132,20 @@
                 <repository>
                     <id>apache-snapshots</id>
                     <name>Apache SNAPSHOT Repository</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
-                </repository>
-                    <!-- for jaxb-impl -->
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1/</url>
-                    <layout>legacy</layout>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
                 </repository>
             </repositories>
             <pluginRepositories>
                 <pluginRepository>
-                    <id>apache-plugin-snapshots</id>
+                    <id>apache-snapshots</id>
                     <name>Apache Maven Plugin Snapshots</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <releases>
                         <enabled>false</enabled>
                     </releases>
@@ -159,14 +156,6 @@
             </pluginRepositories>
         </profile>
     </profiles>
-    <repositories>
-            <!-- for jaxb-impl -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/js_client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/js_client/pom.xml?rev=890828&r1=890827&r2=890828&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/js_client/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/js_client/pom.xml Tue Dec 15 15:29:56 2009
@@ -23,8 +23,8 @@
     <version>1.0</version>
     <name>Hello World Client Demo using JavaScript</name>
     <properties>
-            <cxf.version>[2,)</cxf.version>
-            <rhino.version>1.6R7</rhino.version>
+        <cxf.version>[2,)</cxf.version>
+        <rhino.version>1.6R7</rhino.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -56,9 +56,9 @@
                         </goals>
                     </execution>
                 </executions>
-            </plugin>      
+            </plugin>
         </plugins>
-    </build>   
+    </build>
     <profiles>
         <profile>
             <id>server</id>
@@ -118,23 +118,20 @@
                 <repository>
                     <id>apache-snapshots</id>
                     <name>Apache SNAPSHOT Repository</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
-                </repository>
-                    <!-- for jaxb-impl -->
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1/</url>
-                    <layout>legacy</layout>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
                 </repository>
             </repositories>
             <pluginRepositories>
                 <pluginRepository>
-                    <id>apache-plugin-snapshots</id>
+                    <id>apache-snapshots</id>
                     <name>Apache Maven Plugin Snapshots</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <releases>
                         <enabled>false</enabled>
                     </releases>
@@ -145,14 +142,6 @@
             </pluginRepositories>
         </profile>
     </profiles>
-    <repositories>
-            <!-- for jaxb-impl -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>       
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -175,9 +164,9 @@
             <version>${cxf.version}</version>
         </dependency>
         <dependency>
-           <groupId>rhino</groupId>
-           <artifactId>js</artifactId>
-           <version>${rhino.version}</version>
-        </dependency>        
+            <groupId>rhino</groupId>
+            <artifactId>js</artifactId>
+            <version>${rhino.version}</version>
+        </dependency>
     </dependencies>
 </project>

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/mtom/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/mtom/pom.xml?rev=890828&r1=890827&r2=890828&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/mtom/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/mtom/pom.xml Tue Dec 15 15:29:56 2009
@@ -134,23 +134,20 @@
                 <repository>
                     <id>apache-snapshots</id>
                     <name>Apache SNAPSHOT Repository</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
-                </repository>
-                    <!-- for jaxb-impl -->
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1/</url>
-                    <layout>legacy</layout>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
                 </repository>
             </repositories>
             <pluginRepositories>
                 <pluginRepository>
-                    <id>apache-plugin-snapshots</id>
+                    <id>apache-snapshots</id>
                     <name>Apache Maven Plugin Snapshots</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
                     <releases>
                         <enabled>false</enabled>
                     </releases>
@@ -161,14 +158,6 @@
             </pluginRepositories>
         </profile>
     </profiles>
-    <repositories>
-        <!-- for jaxb-impl -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
     
     <dependencies>
         <dependency>



Mime
View raw message