You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/01/30 18:11:02 UTC

svn commit: r1237794 - in /axis/axis1/java/trunk: distribution/src/main/assembly/ distribution/src/main/files/samples/bidbuy/ samples/ samples/bidbuy-sample/ samples/bidbuy-sample/src/ samples/bidbuy-sample/src/main/ samples/bidbuy-sample/src/main/java...

Author: veithen
Date: Mon Jan 30 17:11:00 2012
New Revision: 1237794

URL: http://svn.apache.org/viewvc?rev=1237794&view=rev
Log:
Mavenized TestBidBuySample.

Added:
    axis/axis1/java/trunk/samples/bidbuy-sample/
    axis/axis1/java/trunk/samples/bidbuy-sample/pom.xml   (with props)
    axis/axis1/java/trunk/samples/bidbuy-sample/src/
    axis/axis1/java/trunk/samples/bidbuy-sample/src/main/
    axis/axis1/java/trunk/samples/bidbuy-sample/src/main/java/
    axis/axis1/java/trunk/samples/bidbuy-sample/src/main/java/samples/
    axis/axis1/java/trunk/samples/bidbuy-sample/src/main/java/samples/bidbuy/
    axis/axis1/java/trunk/samples/bidbuy-sample/src/main/java/samples/bidbuy/Address.java
      - copied unchanged from r1237750, axis/axis1/java/trunk/distribution/src/main/files/samples/bidbuy/Address.java
    axis/axis1/java/trunk/samples/bidbuy-sample/src/main/java/samples/bidbuy/BidService.java
      - copied unchanged from r1237750, axis/axis1/java/trunk/distribution/src/main/files/samples/bidbuy/BidService.java
    axis/axis1/java/trunk/samples/bidbuy-sample/src/main/java/samples/bidbuy/LineItem.java
      - copied unchanged from r1237750, axis/axis1/java/trunk/distribution/src/main/files/samples/bidbuy/LineItem.java
    axis/axis1/java/trunk/samples/bidbuy-sample/src/main/java/samples/bidbuy/PurchaseOrder.java
      - copied unchanged from r1237750, axis/axis1/java/trunk/distribution/src/main/files/samples/bidbuy/PurchaseOrder.java
    axis/axis1/java/trunk/samples/bidbuy-sample/src/main/java/samples/bidbuy/RegistryService.java
      - copied unchanged from r1237750, axis/axis1/java/trunk/distribution/src/main/files/samples/bidbuy/RegistryService.java
    axis/axis1/java/trunk/samples/bidbuy-sample/src/main/java/samples/bidbuy/Service.java
      - copied unchanged from r1237750, axis/axis1/java/trunk/distribution/src/main/files/samples/bidbuy/Service.java
    axis/axis1/java/trunk/samples/bidbuy-sample/src/main/java/samples/bidbuy/TestClient.java
      - copied unchanged from r1237750, axis/axis1/java/trunk/distribution/src/main/files/samples/bidbuy/TestClient.java
    axis/axis1/java/trunk/samples/bidbuy-sample/src/main/java/samples/bidbuy/rfq.java
      - copied unchanged from r1237750, axis/axis1/java/trunk/distribution/src/main/files/samples/bidbuy/rfq.java
    axis/axis1/java/trunk/samples/bidbuy-sample/src/main/java/samples/bidbuy/v3.java
      - copied unchanged from r1237750, axis/axis1/java/trunk/distribution/src/main/files/samples/bidbuy/v3.java
    axis/axis1/java/trunk/samples/bidbuy-sample/src/main/java/samples/bidbuy/vInterface.java
      - copied unchanged from r1237750, axis/axis1/java/trunk/distribution/src/main/files/samples/bidbuy/vInterface.java
    axis/axis1/java/trunk/samples/bidbuy-sample/src/main/wsdd/
    axis/axis1/java/trunk/samples/bidbuy-sample/src/main/wsdd/deploy.wsdd
      - copied unchanged from r1237750, axis/axis1/java/trunk/distribution/src/main/files/samples/bidbuy/deploy.wsdd
    axis/axis1/java/trunk/samples/bidbuy-sample/src/test/
    axis/axis1/java/trunk/samples/bidbuy-sample/src/test/java/
    axis/axis1/java/trunk/samples/bidbuy-sample/src/test/java/test/
    axis/axis1/java/trunk/samples/bidbuy-sample/src/test/java/test/functional/
    axis/axis1/java/trunk/samples/bidbuy-sample/src/test/java/test/functional/TestBidBuySample.java
      - copied, changed from r1237750, axis/axis1/java/trunk/test/functional/TestBidBuySample.java
Removed:
    axis/axis1/java/trunk/distribution/src/main/files/samples/bidbuy/Address.java
    axis/axis1/java/trunk/distribution/src/main/files/samples/bidbuy/BidService.java
    axis/axis1/java/trunk/distribution/src/main/files/samples/bidbuy/LineItem.java
    axis/axis1/java/trunk/distribution/src/main/files/samples/bidbuy/PurchaseOrder.java
    axis/axis1/java/trunk/distribution/src/main/files/samples/bidbuy/RegistryService.java
    axis/axis1/java/trunk/distribution/src/main/files/samples/bidbuy/Service.java
    axis/axis1/java/trunk/distribution/src/main/files/samples/bidbuy/TestClient.java
    axis/axis1/java/trunk/distribution/src/main/files/samples/bidbuy/deploy.wsdd
    axis/axis1/java/trunk/distribution/src/main/files/samples/bidbuy/rfq.java
    axis/axis1/java/trunk/distribution/src/main/files/samples/bidbuy/v3.java
    axis/axis1/java/trunk/distribution/src/main/files/samples/bidbuy/vInterface.java
    axis/axis1/java/trunk/test/functional/TestBidBuySample.java
Modified:
    axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml
    axis/axis1/java/trunk/samples/pom.xml

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=1237794&r1=1237793&r2=1237794&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 17:11:00 2012
@@ -36,6 +36,14 @@
             <directory>../samples/attachments-sample/src/main/wsdd</directory>
             <outputDirectory>samples/attachments</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>../samples/bidbuy-sample/src/main/java</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../samples/bidbuy-sample/src/main/wsdd</directory>
+            <outputDirectory>samples/bidbuy</outputDirectory>
+        </fileSet>
     </fileSets>
     <dependencySets>
         <dependencySet>

Added: axis/axis1/java/trunk/samples/bidbuy-sample/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/bidbuy-sample/pom.xml?rev=1237794&view=auto
==============================================================================
--- axis/axis1/java/trunk/samples/bidbuy-sample/pom.xml (added)
+++ axis/axis1/java/trunk/samples/bidbuy-sample/pom.xml Mon Jan 30 17:11:00 2012
@@ -0,0 +1,97 @@
+<?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>bidbuy-sample</artifactId>
+    <name>Bidbuy 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>
+                    </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/bidbuy-sample/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: axis/axis1/java/trunk/samples/bidbuy-sample/src/test/java/test/functional/TestBidBuySample.java (from r1237750, axis/axis1/java/trunk/test/functional/TestBidBuySample.java)
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/bidbuy-sample/src/test/java/test/functional/TestBidBuySample.java?p2=axis/axis1/java/trunk/samples/bidbuy-sample/src/test/java/test/functional/TestBidBuySample.java&p1=axis/axis1/java/trunk/test/functional/TestBidBuySample.java&r1=1237750&r2=1237794&rev=1237794&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/functional/TestBidBuySample.java (original)
+++ axis/axis1/java/trunk/samples/bidbuy-sample/src/test/java/test/functional/TestBidBuySample.java Mon Jan 30 17:11:00 2012
@@ -34,7 +34,7 @@ public class TestBidBuySample extends Te
     }
     
     public void doTestDeploy () throws Exception {
-        String[] args = { "samples/bidbuy/deploy.wsdd" };
+        String[] args = { System.getProperty("basedir") + "/src/main/wsdd/deploy.wsdd" };
         AdminClient.main(args);
     }
     

Modified: axis/axis1/java/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/pom.xml?rev=1237794&r1=1237793&r2=1237794&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/pom.xml (original)
+++ axis/axis1/java/trunk/samples/pom.xml Mon Jan 30 17:11:00 2012
@@ -33,5 +33,6 @@
     </description>
     <modules>
         <module>attachments-sample</module>
+        <module>bidbuy-sample</module>
     </modules>
 </project>