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 2010/07/28 23:01:59 UTC
svn commit: r980223 - in
/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring: ./ pom.xml
src/ src/main/ src/main/webapp/ src/main/webapp/WEB-INF/
src/main/webapp/WEB-INF/web.xml src/test/ src/test/resources/
src/test/resources/test-web.xml
Author: rfeng
Date: Wed Jul 28 21:01:58 2010
New Revision: 980223
URL: http://svn.apache.org/viewvc?rev=980223&view=rev
Log:
Add artifacts for the webapp
Added:
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/pom.xml (with props)
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/src/
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/src/main/
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/src/main/webapp/
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/src/main/webapp/WEB-INF/
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/src/main/webapp/WEB-INF/web.xml (with props)
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/src/test/
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/src/test/resources/
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/src/test/resources/test-web.xml (with props)
Added: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/pom.xml?rev=980223&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/pom.xml (added)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/pom.xml Wed Jul 28 21:01:58 2010
@@ -0,0 +1,181 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-samples</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>sample-helloworld-spring-webapp</artifactId>
+ <name>Apache Tuscany SCA Sample Spring Helloworld</name>
+ <packaging>war</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-feature-web20</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-spring-webapp</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-spring-runtime</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-webapp</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>sample-helloworld-spring</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <finalName>helloworld-spring</finalName>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- Skip the normal tests, we'll run them in the integration-test phase -->
+ <skip>true</skip>
+ </configuration>
+
+ <executions>
+ <execution>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <!-- Ingore the test failures so that the build will proceed to stop the tomcat server -->
+ <testFailureIgnore>true</testFailureIgnore>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <overlays>
+ <overlay>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>sample-helloworld-spring</artifactId>
+ <type>jar</type>
+ <targetPath>WEB-INF/classes</targetPath>
+ <excludes>
+ <exclude>META-INF/**/*</exclude>
+ </excludes>
+ </overlay>
+
+ <overlay>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>sample-helloworld-spring</artifactId>
+ <type>jar</type>
+ <includes>
+ <include>META-INF/**/*</include>
+ </includes>
+ </overlay>
+
+ <overlay>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-spring-webapp</artifactId>
+ <type>jar</type>
+ <targetPath>WEB-INF/classes</targetPath>
+ <includes>
+ <include>org/apache/tuscany/sca/implementation/spring/webapp/spring-webapp-context.xml</include>
+ </includes>
+ </overlay>
+ </overlays>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.18</version>
+ <configuration>
+ <contextPath>helloworld</contextPath>
+ <stopKey>foo</stopKey>
+ <stopPort>9999</stopPort>
+ </configuration>
+ <executions>
+ <execution>
+ <id>start-jetty</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <overrideWebXml>src/test/resources/test-web.xml</overrideWebXml>
+ <webAppSourceDirectory>${project.build.directory}/${project.build.finalName}</webAppSourceDirectory>
+ <webXml>${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml</webXml>
+ <classesDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</classesDirectory>
+ <scanIntervalSeconds>0</scanIntervalSeconds>
+ <daemon>true</daemon>
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>8085</port>
+ </connector>
+ </connectors>
+ </configuration>
+ </execution>
+ <execution>
+ <id>stop-jetty</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/src/main/webapp/WEB-INF/web.xml?rev=980223&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/src/main/webapp/WEB-INF/web.xml (added)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/src/main/webapp/WEB-INF/web.xml Wed Jul 28 21:01:58 2010
@@ -0,0 +1,51 @@
+<?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 version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <display-name>Apache Tuscany Helloworld Spring Sample</display-name>
+
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>
+ /WEB-INF/classes/helloworld-context.xml
+ /WEB-INF/classes/org/apache/tuscany/sca/implementation/spring/webapp/spring-webapp-context.xml
+ </param-value>
+ </context-param>
+
+ <listener>
+ <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+ </listener>
+
+ <listener>
+ <listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
+ </listener>
+
+ <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: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/src/test/resources/test-web.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/src/test/resources/test-web.xml?rev=980223&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/src/test/resources/test-web.xml (added)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/src/test/resources/test-web.xml Wed Jul 28 21:01:58 2010
@@ -0,0 +1,25 @@
+<?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 version="2.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
+
+</web-app>
Propchange: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-spring/src/test/resources/test-web.xml
------------------------------------------------------------------------------
svn:eol-style = native