Author: veithen
Date: Mon Jan 30 14:32:30 2012
New Revision: 1237679
URL: http://svn.apache.org/viewvc?rev=1237679&view=rev
Log:
Mavenized TestAttachmentsSample.
Added:
axis/axis1/java/trunk/samples/
axis/axis1/java/trunk/samples/attachments-sample/
axis/axis1/java/trunk/samples/attachments-sample/pom.xml (with props)
axis/axis1/java/trunk/samples/attachments-sample/src/
axis/axis1/java/trunk/samples/attachments-sample/src/main/
axis/axis1/java/trunk/samples/attachments-sample/src/main/java/
axis/axis1/java/trunk/samples/attachments-sample/src/main/java/samples/
axis/axis1/java/trunk/samples/attachments-sample/src/main/java/samples/attachments/
axis/axis1/java/trunk/samples/attachments-sample/src/main/java/samples/attachments/EchoAttachment.java
- copied unchanged from r1237652,
axis/axis1/java/trunk/distribution/src/main/files/samples/attachments/EchoAttachment.java
axis/axis1/java/trunk/samples/attachments-sample/src/main/java/samples/attachments/EchoAttachmentsService.java
- copied unchanged from r1237652,
axis/axis1/java/trunk/distribution/src/main/files/samples/attachments/EchoAttachmentsService.java
axis/axis1/java/trunk/samples/attachments-sample/src/main/java/samples/attachments/TestRef.java
- copied unchanged from r1237652,
axis/axis1/java/trunk/distribution/src/main/files/samples/attachments/TestRef.java
axis/axis1/java/trunk/samples/attachments-sample/src/main/wsdd/
axis/axis1/java/trunk/samples/attachments-sample/src/main/wsdd/attachdeploy.wsdd
- copied unchanged from r1237652,
axis/axis1/java/trunk/distribution/src/main/files/samples/attachments/attachdeploy.wsdd
axis/axis1/java/trunk/samples/attachments-sample/src/main/wsdd/attachundeploy.wsdd
- copied unchanged from r1237652,
axis/axis1/java/trunk/distribution/src/main/files/samples/attachments/attachundeploy.wsdd
axis/axis1/java/trunk/samples/attachments-sample/src/main/wsdd/testref.wsdd
- copied unchanged from r1237652,
axis/axis1/java/trunk/distribution/src/main/files/samples/attachments/testref.wsdd
axis/axis1/java/trunk/samples/attachments-sample/src/main/wsdd/testrefundeploy.wsdd
- copied unchanged from r1237652,
axis/axis1/java/trunk/distribution/src/main/files/samples/attachments/testrefundeploy.wsdd
axis/axis1/java/trunk/samples/attachments-sample/src/test/
axis/axis1/java/trunk/samples/attachments-sample/src/test/files/
axis/axis1/java/trunk/samples/attachments-sample/src/test/files/leaveempty.txt
- copied unchanged from r1237652,
axis/axis1/java/trunk/distribution/src/main/files/samples/attachments/leaveempty.txt
axis/axis1/java/trunk/samples/attachments-sample/src/test/java/
axis/axis1/java/trunk/samples/attachments-sample/src/test/java/test/
axis/axis1/java/trunk/samples/attachments-sample/src/test/java/test/functional/
axis/axis1/java/trunk/samples/attachments-sample/src/test/java/test/functional/TestAttachmentsSample.java
- copied, changed from r1237652,
axis/axis1/java/trunk/test/functional/TestAttachmentsSample.java
axis/axis1/java/trunk/samples/pom.xml (with props)
Removed:
axis/axis1/java/trunk/distribution/src/main/files/samples/attachments/EchoAttachment.java
axis/axis1/java/trunk/distribution/src/main/files/samples/attachments/EchoAttachmentsService.java
axis/axis1/java/trunk/distribution/src/main/files/samples/attachments/TestRef.java
axis/axis1/java/trunk/distribution/src/main/files/samples/attachments/attachdeploy.wsdd
axis/axis1/java/trunk/distribution/src/main/files/samples/attachments/attachundeploy.wsdd
axis/axis1/java/trunk/distribution/src/main/files/samples/attachments/leaveempty.txt
axis/axis1/java/trunk/distribution/src/main/files/samples/attachments/testref.wsdd
axis/axis1/java/trunk/distribution/src/main/files/samples/attachments/testrefundeploy.wsdd
axis/axis1/java/trunk/test/functional/TestAttachmentsSample.java
Modified:
axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServer.java
axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml
axis/axis1/java/trunk/pom.xml
Modified:
axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServer.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServer.java?rev=1237679&r1=1237678&r2=1237679&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServer.java
(original)
+++
axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServer.java
Mon Jan 30 14:32:30 2012
@@ -120,6 +120,12 @@ public class StandaloneAxisServer {
mapping.setPathSpec("/services/*");
servletHandler.addServletMapping(mapping);
}
+ {
+ ServletMapping mapping = new ServletMapping();
+ mapping.setServletName("AxisServlet");
+ mapping.setPathSpec("/servlet/AxisServlet");
+ servletHandler.addServletMapping(mapping);
+ }
if (enableJWS) {
ServletMapping mapping = new ServletMapping();
mapping.setServletName("AxisServlet");
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=1237679&r1=1237678&r2=1237679&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
14:32:30 2012
@@ -28,6 +28,14 @@
<directory>src/main/files</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>../samples/attachments-sample/src/main/java</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/attachments-sample/src/main/wsdd</directory>
+ <outputDirectory>samples/attachments</outputDirectory>
+ </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
Modified: axis/axis1/java/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/pom.xml?rev=1237679&r1=1237678&r2=1237679&view=diff
==============================================================================
--- axis/axis1/java/trunk/pom.xml (original)
+++ axis/axis1/java/trunk/pom.xml Mon Jan 30 14:32:30 2012
@@ -67,6 +67,7 @@
<module>axis-jms</module>
<module>integration</module>
<module>axis-war</module>
+ <module>samples</module>
<module>distribution</module>
</modules>
<dependencyManagement>
Added: axis/axis1/java/trunk/samples/attachments-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/attachments-sample/pom.xml?rev=1237679&view=auto
==============================================================================
--- axis/axis1/java/trunk/samples/attachments-sample/pom.xml (added)
+++ axis/axis1/java/trunk/samples/attachments-sample/pom.xml Mon Jan 30
14:32:30 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>attachments-sample</artifactId>
+ <name>Attachments 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/attachments-sample/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
axis/axis1/java/trunk/samples/attachments-sample/src/test/java/test/functional/TestAttachmentsSample.java
(from r1237652,
axis/axis1/java/trunk/test/functional/TestAttachmentsSample.java)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/attachments-sample/src/test/java/test/functional/TestAttachmentsSample.java?p2=axis/axis1/java/trunk/samples/attachments-sample/src/test/java/test/functional/TestAttachmentsSample.java&p1=axis/axis1/java/trunk/test/functional/TestAttachmentsSample.java&r1=1237652&r2=1237679&rev=1237679&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/functional/TestAttachmentsSample.java (original)
+++
axis/axis1/java/trunk/samples/attachments-sample/src/test/java/test/functional/TestAttachmentsSample.java
Mon Jan 30 14:32:30 2012
@@ -36,37 +36,37 @@ public class TestAttachmentsSample exten
}
public void doTestDeploy () throws Exception {
- AdminClient.main(new String[]{"samples/attachments/attachdeploy.wsdd"
});
- AdminClient.main(new String[]{"samples/attachments/testref.wsdd"});
+ AdminClient.main(new String[]{ System.getProperty("basedir") +
"/src/main/wsdd/attachdeploy.wsdd" });
+ AdminClient.main(new String[]{ System.getProperty("basedir") +
"/src/main/wsdd/testref.wsdd"});
}
public void doTestAttachments1() throws Exception {
Options opts = new Options( new String[]{});
- boolean res = new EchoAttachment(opts).echo(false,
"samples/attachments/README");
+ boolean res = new EchoAttachment(opts).echo(false,
System.getProperty("basedir") + "/pom.xml");
assertEquals("Didn't process attachment correctly", res, true) ;
}
public void doTestAttachmentsD1() throws Exception {
Options opts = new Options( new String[]{});
- boolean res = new EchoAttachment(opts).echo(true,
"samples/attachments/README");
+ boolean res = new EchoAttachment(opts).echo(true,
System.getProperty("basedir") + "/pom.xml");
assertEquals("Didn't process attachment correctly", res, true) ;
}
public void doTestAttachmentsDimeLeaveEmpty() throws Exception {
Options opts = new Options( new String[]{});
- boolean res = new EchoAttachment(opts).echo(true,
"samples/attachments/leaveempty.txt");
+ boolean res = new EchoAttachment(opts).echo(true,
System.getProperty("basedir") + "/src/test/files/leaveempty.txt");
assertEquals("Didn't process attachment correctly", res, true) ;
}
public void doTestAttachments2() throws Exception {
Options opts = new Options( new String[]{});
- boolean res = new EchoAttachment(opts).echoDir(false,
"samples/attachments");
+ boolean res = new EchoAttachment(opts).echoDir(false,
System.getProperty("basedir") + "/src/main/java/samples/attachments");
assertEquals("Didn't process attachments correctly", res, true);
}
public void doTestAttachmentsD2() throws Exception {
Options opts = new Options( new String[]{});
- boolean res = new EchoAttachment(opts).echoDir(true,
"samples/attachments");
+ boolean res = new EchoAttachment(opts).echoDir(true,
System.getProperty("basedir") + "/src/main/java/samples/attachments");
assertEquals("Didn't process attachments correctly", res, true);
}
@@ -77,8 +77,8 @@ public class TestAttachmentsSample exten
}
public void doTestUndeploy () throws Exception {
- AdminClient.main(new String[]{
"samples/attachments/attachundeploy.wsdd" });
- AdminClient.main(new String[]{
"samples/attachments/testrefundeploy.wsdd" });
+ AdminClient.main(new String[]{ System.getProperty("basedir") +
"/src/main/wsdd/attachundeploy.wsdd" });
+ AdminClient.main(new String[]{ System.getProperty("basedir") +
"/src/main/wsdd/testrefundeploy.wsdd" });
}
public static void main(String args[]) throws Exception {
Added: axis/axis1/java/trunk/samples/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/pom.xml?rev=1237679&view=auto
==============================================================================
--- axis/axis1/java/trunk/samples/pom.xml (added)
+++ axis/axis1/java/trunk/samples/pom.xml Mon Jan 30 14:32:30 2012
@@ -0,0 +1,37 @@
+<?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>axis-project</artifactId>
+ <version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>samples</artifactId>
+ <name>Samples</name>
+ <packaging>pom</packaging>
+ <description>
+ Root POM for the Axis samples.
+ </description>
+ <modules>
+ <module>attachments-sample</module>
+ </modules>
+</project>
Propchange: axis/axis1/java/trunk/samples/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
