You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/02/03 08:04:58 UTC
svn commit: r617961 - in /incubator/tuscany/java/sca/itest/services: ./
src/main/webapp/ src/main/webapp/META-INF/ src/main/webapp/WEB-INF/
Author: rfeng
Date: Sat Feb 2 23:04:56 2008
New Revision: 617961
URL: http://svn.apache.org/viewvc?rev=617961&view=rev
Log:
Convert an itest to be able to run as a web app
Added:
incubator/tuscany/java/sca/itest/services/src/main/webapp/
incubator/tuscany/java/sca/itest/services/src/main/webapp/META-INF/
incubator/tuscany/java/sca/itest/services/src/main/webapp/META-INF/sca-contribution.xml (with props)
incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/
incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/geronimo-web.xml (with props)
incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/web.xml (with props)
Modified:
incubator/tuscany/java/sca/itest/services/pom.xml
Modified: incubator/tuscany/java/sca/itest/services/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/services/pom.xml?rev=617961&r1=617960&r2=617961&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/services/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/services/pom.xml Sat Feb 2 23:04:56 2008
@@ -43,4 +43,226 @@
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>webapp</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-webapp</artifactId>
+ <version>1.2-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <!-- marking dependency as provided to exclude from war file -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.2</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <configuration>
+ <finalName>junit</finalName>
+ </configuration>
+ <phase>test</phase>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <webResources>
+ <resource>
+ <!-- this is relative to the pom.xml directory -->
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>*-tests.jar</include>
+ </includes>
+ <targetPath>WEB-INF/test-lib</targetPath>
+ </resource>
+ </webResources>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>war</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-web-junit</artifactId>
+ <version>1.2-incubating-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <configuration>
+ <url>http://localhost:8085/${project.build.finalName}/junit</url>
+ </configuration>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+
+ <profile>
+ <id>jetty</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>start-container</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>stop-container</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <container>
+ <containerId>jetty6x</containerId>
+ <type>embedded</type>
+ <systemProperties>
+ <org.apache.commons.logging.Log>
+ org.apache.commons.logging.impl.SimpleLog
+ </org.apache.commons.logging.Log>
+ </systemProperties>
+ </container>
+ <wait>false</wait>
+ <configuration>
+ <properties>
+ <cargo.servlet.port>8085</cargo.servlet.port>
+ </properties>
+ <deployables>
+ <deployable>
+ <location>${project.build.directory}/${project.build.finalName}.war</location>
+ <pingURL>http://localhost:8085/${project.build.finalName}/junit</pingURL>
+ <type>war</type>
+ </deployable>
+ </deployables>
+ </configuration>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>geronimo</id>
+ <activation>
+ <property>
+ <name>geronimo.home</name>
+ </property>
+ </activation>
+
+ <properties>
+ <geronimo.home>C:\Apache\geronimo-tomcat6-jee5-2.0.2</geronimo.home>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <geronimoHome>${geronimo.home}</geronimoHome>
+ </configuration>
+ <executions>
+ <execution>
+ <id>start-container</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ <configuration>
+ <background>true</background>
+ </configuration>
+
+ </execution>
+ <execution>
+ <id>deploy-war</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>
+ ${project.build.directory}/${project.build.finalName}.war
+ </moduleArchive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>undeploy-war</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy</goal>
+ </goals>
+ <configuration>
+ <moduleId>
+ org.apache.tuscany.sca/sample-calculator-webapp/1.2-incubating-SNAPSHOT/war
+ </moduleId>
+ </configuration>
+ </execution>
+ <execution>
+ <id>stop-container</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ <configuration>
+ <username>system</username>
+ <password>manager</password>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Added: incubator/tuscany/java/sca/itest/services/src/main/webapp/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/services/src/main/webapp/META-INF/sca-contribution.xml?rev=617961&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/services/src/main/webapp/META-INF/sca-contribution.xml (added)
+++ incubator/tuscany/java/sca/itest/services/src/main/webapp/META-INF/sca-contribution.xml Sat Feb 2 23:04:56 2008
@@ -0,0 +1,24 @@
+<?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.
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ targetNamespace="http://foo"
+ xmlns:f="http://foo">
+ <deployable composite="f:InnerServicesTest"/>
+</contribution>
\ No newline at end of file
Propchange: incubator/tuscany/java/sca/itest/services/src/main/webapp/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/itest/services/src/main/webapp/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/geronimo-web.xml?rev=617961&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/geronimo-web.xml Sat Feb 2 23:04:56 2008
@@ -0,0 +1,34 @@
+<?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.
+-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
+ xmlns:d="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+ <d:environment>
+ <d:moduleId>
+ <d:groupId>org.apache.tuscany.sca</d:groupId>
+ <d:artifactId>itest-services</d:artifactId>
+ <d:version>1.2-incubating-SNAPSHOT</d:version>
+ <d:type>war</d:type>
+ </d:moduleId>
+
+ <!-- TUSCANY-1986 -->
+ <d:inverse-classloading />
+ </d:environment>
+</web-app>
Propchange: incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/web.xml?rev=617961&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/web.xml (added)
+++ incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/web.xml Sat Feb 2 23:04:56 2008
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ * 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.
+-->
+
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
+Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+
+ <display-name>Apache Tuscany Calculator Web Service Sample</display-name>
+
+ <filter>
+ <filter-name>tuscany</filter-name>
+ <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>tuscany</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+</web-app>
Propchange: incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org