You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/12/15 16:19:49 UTC
svn commit: r890822 [3/3] - in /cxf/branches/2.2.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...
Modified: cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first_https/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first_https/pom.xml?rev=890822&r1=890821&r2=890822&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first_https/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first_https/pom.xml Tue Dec 15 15:19:47 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,32 +54,32 @@
<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}/src/demo/hw_https/server/CherryServer.xml" todir="${basedir}/target/classes/demo/hw_https/server"/>
- <copy file="${basedir}/src/demo/hw_https/client/WibbleClient.xml" todir="${basedir}/target/classes/demo/hw_https/client"/>
- <copy file="${basedir}/src/demo/hw_https/client/InsecureClient.xml" todir="${basedir}/target/classes/demo/hw_https/client"/>
- <copy todir="${basedir}/target/classes/certs">
- <fileset dir="${basedir}/certs"/>
- </copy>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy file="${basedir}/src/demo/hw_https/server/CherryServer.xml" todir="${basedir}/target/classes/demo/hw_https/server"/>
+ <copy file="${basedir}/src/demo/hw_https/client/WibbleClient.xml" todir="${basedir}/target/classes/demo/hw_https/client"/>
+ <copy file="${basedir}/src/demo/hw_https/client/InsecureClient.xml" todir="${basedir}/target/classes/demo/hw_https/client"/>
+ <copy todir="${basedir}/target/classes/certs">
+ <fileset dir="${basedir}/certs"/>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<profiles>
<profile>
<id>server</id>
@@ -128,13 +128,13 @@
<arguments>
<argument>${basedir}/wsdl/hello_world.wsdl</argument>
<argument>insecure</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<id>insecure.client.non.spring</id>
@@ -155,13 +155,13 @@
<arguments>
<argument>${basedir}/wsdl/hello_world.wsdl</argument>
<argument>insecure</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<id>secure.client</id>
@@ -182,13 +182,13 @@
<arguments>
<argument>${basedir}/wsdl/hello_world.wsdl</argument>
<argument>secure</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<id>secure.client.non.spring</id>
@@ -209,54 +209,45 @@
<arguments>
<argument>${basedir}/wsdl/hello_world.wsdl</argument>
<argument>secure</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>
@@ -269,9 +260,9 @@
<version>${cxf.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- </dependencies>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ </dependencies>
</project>
Modified: cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first_pure_xml/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first_pure_xml/pom.xml?rev=890822&r1=890821&r2=890822&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first_pure_xml/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first_pure_xml/pom.xml Tue Dec 15 15:19:47 2009
@@ -23,7 +23,7 @@
<version>1.0</version>
<name>WSDL first demo using BARE Style in XML Binding (pure XML over HTTP)</name>
<properties>
- <cxf.version>[2,)</cxf.version>
+ <cxf.version>[2,)</cxf.version>
</properties>
<build>
<sourceDirectory>src</sourceDirectory>
@@ -57,7 +57,7 @@
</executions>
</plugin>
</plugins>
- </build>
+ </build>
<profiles>
<profile>
<id>server</id>
@@ -76,7 +76,7 @@
<configuration>
<mainClass>demo.hw.server.Server</mainClass>
<arguments>
- <argument>${basedir}/wsdl/hello_world.wsdl</argument>
+ <argument>${basedir}/wsdl/hello_world.wsdl</argument>
</arguments>
</configuration>
</execution>
@@ -117,23 +117,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>
@@ -144,14 +141,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.2.x-fixes/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml?rev=890822&r1=890821&r2=890822&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml Tue Dec 15 15:19:47 2009
@@ -23,7 +23,7 @@
<version>1.0</version>
<name>WSDL first demo using RPC-Literal Style</name>
<properties>
- <cxf.version>[2,)</cxf.version>
+ <cxf.version>[2,)</cxf.version>
</properties>
<build>
<sourceDirectory>src</sourceDirectory>
@@ -57,7 +57,7 @@
</executions>
</plugin>
</plugins>
- </build>
+ </build>
<profiles>
<profile>
<id>server</id>
@@ -76,7 +76,7 @@
<configuration>
<mainClass>demo.hwRPCLit.server.Server</mainClass>
<arguments>
- <argument>${basedir}/wsdl/hello_world_RPCLit.wsdl</argument>
+ <argument>${basedir}/wsdl/hello_world_RPCLit.wsdl</argument>
</arguments>
</configuration>
</execution>
@@ -117,23 +117,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>
@@ -144,14 +141,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.2.x-fixes/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml?rev=890822&r1=890821&r2=890822&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml Tue Dec 15 15:19:47 2009
@@ -23,7 +23,7 @@
<version>1.0</version>
<name>WSDL first demo using SOAP12 in Document/Literal Style</name>
<properties>
- <cxf.version>[2,)</cxf.version>
+ <cxf.version>[2,)</cxf.version>
</properties>
<build>
<sourceDirectory>src</sourceDirectory>
@@ -57,7 +57,7 @@
</executions>
</plugin>
</plugins>
- </build>
+ </build>
<profiles>
<profile>
<id>server</id>
@@ -76,7 +76,7 @@
<configuration>
<mainClass>demo.hw.server.Server</mainClass>
<arguments>
- <argument>${basedir}/wsdl/hello_world_soap12.wsdl</argument>
+ <argument>${basedir}/wsdl/hello_world_soap12.wsdl</argument>
</arguments>
</configuration>
</execution>
@@ -112,30 +112,30 @@
</build>
</profile>
<profile>
- <id>client.get</id>
- <build>
- <defaultGoal>test</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>java</goal>
- </goals>
- <configuration>
- <mainClass>demo.hw.client.Get</mainClass>
- <arguments>
- <argument>${basedir}/wsdl/hello_world_soap12.wsdl</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <id>client.get</id>
+ <build>
+ <defaultGoal>test</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ <mainClass>demo.hw.client.Get</mainClass>
+ <arguments>
+ <argument>${basedir}/wsdl/hello_world_soap12.wsdl</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<id>snapshots</id>
@@ -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.2.x-fixes/distribution/src/main/release/samples/wsdl_first_xml_wrapped/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first_xml_wrapped/pom.xml?rev=890822&r1=890821&r2=890822&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first_xml_wrapped/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first_xml_wrapped/pom.xml Tue Dec 15 15:19:47 2009
@@ -23,7 +23,7 @@
<version>1.0</version>
<name>CXF sample using WRAPPED Style in XML Binding (pure XML over HTTP)</name>
<properties>
- <cxf.version>[2,)</cxf.version>
+ <cxf.version>[2,)</cxf.version>
</properties>
<build>
<sourceDirectory>src</sourceDirectory>
@@ -57,7 +57,7 @@
</executions>
</plugin>
</plugins>
- </build>
+ </build>
<profiles>
<profile>
<id>server</id>
@@ -76,7 +76,7 @@
<configuration>
<mainClass>demo.hw.server.Server</mainClass>
<arguments>
- <argument>${basedir}/wsdl/hello_world.wsdl</argument>
+ <argument>${basedir}/wsdl/hello_world.wsdl</argument>
</arguments>
</configuration>
</execution>
@@ -112,30 +112,30 @@
</build>
</profile>
<profile>
- <id>client.get</id>
- <build>
- <defaultGoal>test</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>java</goal>
- </goals>
- <configuration>
- <mainClass>demo.hw.client.Get</mainClass>
- <arguments>
- <argument>${basedir}/wsdl/hello_world.wsdl</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <id>client.get</id>
+ <build>
+ <defaultGoal>test</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ <mainClass>demo.hw.client.Get</mainClass>
+ <arguments>
+ <argument>${basedir}/wsdl/hello_world.wsdl</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<id>snapshots</id>
@@ -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.2.x-fixes/distribution/src/main/release/samples/wsdl_first_xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first_xmlbeans/pom.xml?rev=890822&r1=890821&r2=890822&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first_xmlbeans/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first_xmlbeans/pom.xml Tue Dec 15 15:19:47 2009
@@ -136,23 +136,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>
@@ -162,16 +159,7 @@
</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>
-
+ </profiles>
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>