Author: veithen
Date: Mon Jan 30 22:51:21 2012
New Revision: 1238064
URL: http://svn.apache.org/viewvc?rev=1238064&view=rev
Log:
Mavenized TestStockSample.
Added:
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/FileSet.java
- copied, changed from r1237878,
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/WSDD.java
axis/axis1/java/trunk/samples/stock-sample/
axis/axis1/java/trunk/samples/stock-sample/pom.xml (with props)
axis/axis1/java/trunk/samples/stock-sample/src/
axis/axis1/java/trunk/samples/stock-sample/src/main/
axis/axis1/java/trunk/samples/stock-sample/src/main/config/
axis/axis1/java/trunk/samples/stock-sample/src/main/config/users.lst
- copied unchanged from r1237878,
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/users.lst
axis/axis1/java/trunk/samples/stock-sample/src/main/java/
axis/axis1/java/trunk/samples/stock-sample/src/main/java/samples/
axis/axis1/java/trunk/samples/stock-sample/src/main/java/samples/stock/
axis/axis1/java/trunk/samples/stock-sample/src/main/java/samples/stock/ComInfoService.java
- copied unchanged from r1237878,
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/ComInfoService.java
axis/axis1/java/trunk/samples/stock-sample/src/main/java/samples/stock/GetInfo.java
- copied unchanged from r1237878,
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/GetInfo.java
axis/axis1/java/trunk/samples/stock-sample/src/main/java/samples/stock/GetQuote.java
- copied unchanged from r1237878,
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/GetQuote.java
axis/axis1/java/trunk/samples/stock-sample/src/main/java/samples/stock/GetQuote1.java
- copied unchanged from r1237878,
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/GetQuote1.java
axis/axis1/java/trunk/samples/stock-sample/src/main/java/samples/stock/GetQuote2.java
- copied, changed from r1237878,
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/GetQuote2.java
axis/axis1/java/trunk/samples/stock-sample/src/main/java/samples/stock/StockQuoteService.java
- copied unchanged from r1237878,
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/StockQuoteService.java
axis/axis1/java/trunk/samples/stock-sample/src/main/jws/
axis/axis1/java/trunk/samples/stock-sample/src/main/jws/StockQuoteService.jws
- copied unchanged from r1237878,
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/StockQuoteService.jws
axis/axis1/java/trunk/samples/stock-sample/src/main/resources/
axis/axis1/java/trunk/samples/stock-sample/src/main/resources/samples/
axis/axis1/java/trunk/samples/stock-sample/src/main/resources/samples/stock/
axis/axis1/java/trunk/samples/stock-sample/src/main/resources/samples/stock/GetQuote.wsdl
- copied unchanged from r1237878,
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/GetQuote.wsdl
axis/axis1/java/trunk/samples/stock-sample/src/main/wsdd/
axis/axis1/java/trunk/samples/stock-sample/src/main/wsdd/deploy.wsdd
- copied unchanged from r1237878,
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/deploy.wsdd
axis/axis1/java/trunk/samples/stock-sample/src/main/wsdd/undeploy.wsdd
- copied unchanged from r1237878,
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/undeploy.wsdd
axis/axis1/java/trunk/samples/stock-sample/src/test/
axis/axis1/java/trunk/samples/stock-sample/src/test/java/
axis/axis1/java/trunk/samples/stock-sample/src/test/java/test/
axis/axis1/java/trunk/samples/stock-sample/src/test/java/test/functional/
axis/axis1/java/trunk/samples/stock-sample/src/test/java/test/functional/TestStockSample.java
- copied, changed from r1237878,
axis/axis1/java/trunk/test/functional/TestStockSample.java
Removed:
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/WSDD.java
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/ComInfoService.java
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/GetInfo.java
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/GetQuote.java
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/GetQuote.wsdl
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/GetQuote1.java
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/GetQuote2.java
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/StockQuoteService.java
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/StockQuoteService.jws
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/deploy.wsdd
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/undeploy.wsdd
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/users.lst
axis/axis1/java/trunk/test/functional/TestStockSample.java
Modified:
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/StartServerMojo.java
axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml
axis/axis1/java/trunk/samples/pom.xml
Copied:
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/FileSet.java
(from r1237878,
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/WSDD.java)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/FileSet.java?p2=axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/FileSet.java&p1=axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/WSDD.java&r1=1237878&r2=1238064&rev=1238064&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/WSDD.java
(original)
+++
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/FileSet.java
Mon Jan 30 22:51:21 2012
@@ -20,7 +20,9 @@ package org.apache.axis.maven;
import java.io.File;
-public class WSDD {
+import org.codehaus.plexus.util.DirectoryScanner;
+
+public class FileSet {
private File directory;
private String[] includes;
private String[] excludes;
@@ -48,4 +50,12 @@ public class WSDD {
public void setExcludes(String[] excludes) {
this.excludes = excludes;
}
+
+ public DirectoryScanner createScanner() {
+ DirectoryScanner scanner = new DirectoryScanner();
+ scanner.setBasedir(directory);
+ scanner.setIncludes(includes);
+ scanner.setExcludes(excludes);
+ return scanner;
+ }
}
Modified:
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/StartServerMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/StartServerMojo.java?rev=1238064&r1=1238063&r2=1238064&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/StartServerMojo.java
(original)
+++
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/StartServerMojo.java
Mon Jan 30 22:51:21 2012
@@ -79,7 +79,7 @@ public class StartServerMojo extends Abs
*
* @parameter
*/
- private WSDD[] wsdds;
+ private FileSet[] wsdds;
/**
* A set of directories to look up JWS files from.
@@ -89,6 +89,14 @@ public class StartServerMojo extends Abs
private File[] jwsDirs;
/**
+ * A set of config files to copy to the <tt>WEB-INF</tt> dir. An example
of a config file
+ * would be <tt>users.lst</tt> used by <code>SimpleSecurityProvider</code>.
+ *
+ * @parameter
+ */
+ private FileSet[] configs;
+
+ /**
* If this flag is set to <code>true</code>, then the execution of the
goal will block after the
* server has been started and the services are deployed. This is useful
if one wants to
* manually test some services deployed on the server or if one wants to
run the integration
@@ -162,11 +170,8 @@ public class StartServerMojo extends Abs
if (wsdds != null && wsdds.length > 0) {
wsddFiles = new ArrayList();
for (int i=0; i<wsdds.length; i++) {
- WSDD wsdd = wsdds[i];
- DirectoryScanner scanner = new DirectoryScanner();
- scanner.setBasedir(wsdd.getDirectory());
- scanner.setIncludes(wsdd.getIncludes());
- scanner.setExcludes(wsdd.getExcludes());
+ FileSet wsdd = wsdds[i];
+ DirectoryScanner scanner = wsdd.createScanner();
scanner.scan();
String[] includedFiles = scanner.getIncludedFiles();
for (int j=0; j<includedFiles.length; j++) {
@@ -200,8 +205,27 @@ public class StartServerMojo extends Abs
} catch (IOException ex) {
throw new MojoFailureException("Failed to clean the work
directory", ex);
}
- } else {
- workDir.mkdirs();
+ }
+ workDir.mkdirs();
+
+ if (configs != null && configs.length > 0) {
+ File webInfDir = new File(workDir, "WEB-INF");
+ webInfDir.mkdirs();
+ for (int i=0; i<configs.length; i++) {
+ FileSet config = configs[i];
+ DirectoryScanner scanner = config.createScanner();
+ scanner.scan();
+ String[] includedFiles = scanner.getIncludedFiles();
+ for (int j=0; j<includedFiles.length; j++) {
+ String includedFile = includedFiles[j];
+ File source = new File(config.getDirectory(),
includedFile);
+ try {
+ FileUtils.copyFile(source, new File(webInfDir,
includedFile));
+ } catch (IOException ex) {
+ throw new MojoFailureException("Unable to copy " +
source, ex);
+ }
+ }
+ }
}
// Start the server
Modified: axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml?rev=1238064&r1=1238063&r2=1238064&view=diff
==============================================================================
--- axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml (original)
+++ axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml Mon Jan 30
22:51:21 2012
@@ -72,6 +72,26 @@
<directory>../samples/faults-sample/src/main/wsdd</directory>
<outputDirectory>samples/faults</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>../samples/stock-sample/src/main/java</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/stock-sample/src/main/resources</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/stock-sample/src/main/config</directory>
+ <outputDirectory>samples/stock</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/stock-sample/src/main/jws</directory>
+ <outputDirectory>samples/stock</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/stock-sample/src/main/wsdd</directory>
+ <outputDirectory>samples/stock</outputDirectory>
+ </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
Modified: axis/axis1/java/trunk/samples/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/pom.xml?rev=1238064&r1=1238063&r2=1238064&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/pom.xml (original)
+++ axis/axis1/java/trunk/samples/pom.xml Mon Jan 30 22:51:21 2012
@@ -37,5 +37,6 @@
<module>echo-sample</module>
<module>encoding-sample</module>
<module>faults-sample</module>
+ <module>stock-sample</module>
</modules>
</project>
Added: axis/axis1/java/trunk/samples/stock-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/stock-sample/pom.xml?rev=1238064&view=auto
==============================================================================
--- axis/axis1/java/trunk/samples/stock-sample/pom.xml (added)
+++ axis/axis1/java/trunk/samples/stock-sample/pom.xml Mon Jan 30 22:51:21 2012
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.axis</groupId>
+ <artifactId>samples</artifactId>
+ <version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>stock-sample</artifactId>
+ <name>Stock Quote Sample</name>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-standalone-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <id>start-server</id>
+ <goals>
+ <goal>start-server</goal>
+ </goals>
+ <configuration>
+ <configs>
+ <config>
+ <directory>src/main/config</directory>
+ </config>
+ </configs>
+ <jwsDirs>
+ <jwsDir>src/main/jws</jwsDir>
+ </jwsDirs>
+ </configuration>
+ </execution>
+ <execution>
+ <id>stop-server</id>
+ <goals>
+ <goal>stop-server</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: axis/axis1/java/trunk/samples/stock-sample/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
axis/axis1/java/trunk/samples/stock-sample/src/main/java/samples/stock/GetQuote2.java
(from r1237878,
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/GetQuote2.java)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/stock-sample/src/main/java/samples/stock/GetQuote2.java?p2=axis/axis1/java/trunk/samples/stock-sample/src/main/java/samples/stock/GetQuote2.java&p1=axis/axis1/java/trunk/distribution/src/main/files/samples/stock/GetQuote2.java&r1=1237878&r2=1238064&rev=1238064&view=diff
==============================================================================
---
axis/axis1/java/trunk/distribution/src/main/files/samples/stock/GetQuote2.java
(original)
+++
axis/axis1/java/trunk/samples/stock-sample/src/main/java/samples/stock/GetQuote2.java
Mon Jan 30 22:51:21 2012
@@ -47,7 +47,7 @@ public class GetQuote2 {
/* Now use those QNames as pointers into the WSDL doc */
/******************************************************/
- Service service = new Service( new URL("file:GetQuote.wsdl"), servQN );
+ Service service = new Service(
GetQuote2.class.getResource("GetQuote.wsdl"), servQN );
Call call = (Call) service.createCall( portQN, "getQuote" );
/* Strange - but allows the user to change just certain portions of */
Copied:
axis/axis1/java/trunk/samples/stock-sample/src/test/java/test/functional/TestStockSample.java
(from r1237878, axis/axis1/java/trunk/test/functional/TestStockSample.java)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/stock-sample/src/test/java/test/functional/TestStockSample.java?p2=axis/axis1/java/trunk/samples/stock-sample/src/test/java/test/functional/TestStockSample.java&p1=axis/axis1/java/trunk/test/functional/TestStockSample.java&r1=1237878&r2=1238064&rev=1238064&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/functional/TestStockSample.java (original)
+++
axis/axis1/java/trunk/samples/stock-sample/src/test/java/test/functional/TestStockSample.java
Mon Jan 30 22:51:21 2012
@@ -36,7 +36,7 @@ public class TestStockSample extends Tes
}
public void doTestStockJWS () throws Exception {
- String[] args = { "-uuser1", "-wpass1", "XXX",
"-sjws/StockQuoteService.jws" };
+ String[] args = { "-uuser1", "-wpass1", "XXX",
"-saxis/StockQuoteService.jws" };
float val = new GetQuote().getQuote(args);
assertEquals("TestStockSample.doTestStockJWS(): stock price should be
66.25", val, 66.25, 0.01);
@@ -53,7 +53,7 @@ public class TestStockSample extends Tes
}
public void doTestDeploy () throws Exception {
- String[] args = { "samples/stock/deploy.wsdd" };
+ String[] args = { System.getProperty("basedir") +
"/src/main/wsdd/deploy.wsdd" };
AdminClient.main(args);
}
@@ -76,7 +76,7 @@ public class TestStockSample extends Tes
}
public void doTestUndeploy () throws Exception {
- String[] args = { "samples/stock/undeploy.wsdd" };
+ String[] args = { System.getProperty("basedir") +
"/src/main/wsdd/undeploy.wsdd" };
AdminClient.main(args);
}
