Author: dkulp
Date: Wed Jul 28 15:20:21 2010
New Revision: 980092
URL: http://svn.apache.org/viewvc?rev=980092&view=rev
Log:
Add comment to explain import scope
Add distroMgmt section so deploy plugin doesn't barf
Fix some checkstyle things
Use same version of antrun and ant-trax
Modified:
cxf/trunk/distribution/src/main/release/samples/aegis/src/demo/hw/server/Server.java
cxf/trunk/distribution/src/main/release/samples/aegis/testSrc/org/apache/cxf/sample/test/TestAegisSample.java
cxf/trunk/distribution/src/main/release/samples/pom.xml
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml
Modified:
cxf/trunk/distribution/src/main/release/samples/aegis/src/demo/hw/server/Server.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/aegis/src/demo/hw/server/Server.java?rev=980092&r1=980091&r2=980092&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/aegis/src/demo/hw/server/Server.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/aegis/src/demo/hw/server/Server.java
Wed Jul 28 15:20:21 2010
@@ -22,9 +22,11 @@ package demo.hw.server;
import org.apache.cxf.aegis.databinding.AegisDatabinding;
import org.apache.cxf.frontend.ServerFactoryBean;
-public class Server {
+public final class Server {
+ private Server() {
+ }
- public Server() throws Exception {
+ public static void startServer() throws Exception {
HelloWorldImpl helloworldImpl = new HelloWorldImpl();
ServerFactoryBean svrFactory = new ServerFactoryBean();
svrFactory.setServiceClass(HelloWorld.class);
@@ -35,7 +37,7 @@ public class Server {
}
public static void main(String args[]) throws Exception {
- new Server();
+ startServer();
System.out.println("Server ready...");
Thread.sleep(5 * 60 * 1000);
Modified:
cxf/trunk/distribution/src/main/release/samples/aegis/testSrc/org/apache/cxf/sample/test/TestAegisSample.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/aegis/testSrc/org/apache/cxf/sample/test/TestAegisSample.java?rev=980092&r1=980091&r2=980092&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/aegis/testSrc/org/apache/cxf/sample/test/TestAegisSample.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/aegis/testSrc/org/apache/cxf/sample/test/TestAegisSample.java
Wed Jul 28 15:20:21 2010
@@ -19,11 +19,12 @@
package org.apache.cxf.sample.test;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
import demo.hw.client.Client;
import demo.hw.server.Server;
-import org.junit.BeforeClass;
-import org.junit.Test;
/**
*
Modified: cxf/trunk/distribution/src/main/release/samples/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/pom.xml?rev=980092&r1=980091&r2=980092&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/pom.xml Wed Jul 28 15:20:21
2010
@@ -85,17 +85,23 @@
</modules>
<dependencyManagement>
<dependencies>
+ <!--
+ Pull in the cxf-parents as import scope to re-use the
dependenecyManagement
+ sections of those poms. Those sections define the versions of
various third
+ party deps that CXF used to build with and test with and we would
like
+ to make sure the same versions are used for the samples
+ -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -118,6 +124,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.8.0</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
@@ -153,4 +166,23 @@
</pluginRepositories>
</profile>
</profiles>
+
+ <!--
+ we turn off the deploy in the properties above, but deploy plugin will
+ still barf without this section in the pom
+ -->
+ <distributionManagement>
+ <repository>
+ <id>apache.releases.https</id>
+ <name>Apache Release Distribution Repository</name>
+
<url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
+ </repository>
+ <snapshotRepository>
+ <id>apache.snapshots.https</id>
+ <name>Apache Development Snapshot Repository</name>
+
<url>https://repository.apache.org/content/repositories/snapshots</url>
+ <uniqueVersion>false</uniqueVersion>
+ </snapshotRepository>
+ </distributionManagement>
+
</project>
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml?rev=980092&r1=980091&r2=980092&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml
Wed Jul 28 15:20:21 2010
@@ -58,7 +58,6 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
<executions>
<execution>
<id>download-certs-wsdl</id>
@@ -77,13 +76,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.7.1</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml?rev=980092&r1=980091&r2=980092&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml
Wed Jul 28 15:20:21 2010
@@ -57,7 +57,6 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
<executions>
<execution>
<id>download-certs-wsdl</id>
@@ -75,13 +74,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.7.1</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml?rev=980092&r1=980091&r2=980092&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml
Wed Jul 28 15:20:21 2010
@@ -57,7 +57,6 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
<executions>
<execution>
<id>download-certs-wsdl</id>
@@ -75,13 +74,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.7.1</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml?rev=980092&r1=980091&r2=980092&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
Wed Jul 28 15:20:21 2010
@@ -79,13 +79,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.7.1</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml?rev=980092&r1=980091&r2=980092&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml
Wed Jul 28 15:20:21 2010
@@ -58,7 +58,6 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
<executions>
<execution>
<id>download-certs-wsdl</id>
@@ -76,13 +75,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.7.1</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
