Author: antelder
Date: Fri Apr 23 11:09:39 2010
New Revision: 937250
URL: http://svn.apache.org/viewvc?rev=937250&view=rev
Log:
Update to embedded helloworld sample contribution
Added:
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/src/main/webapp/embeddedContributions/
(with props)
Removed:
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/src/main/java/
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite
Modified:
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/pom.xml
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml
Modified: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/pom.xml?rev=937250&r1=937249&r2=937250&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/pom.xml Fri Apr 23
11:09:39 2010
@@ -43,6 +43,32 @@
<build>
<finalName>helloworld</finalName>
<plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>sample-helloworld</artifactId>
+ <version>${pom.version}</version>
+ <!-- should really go in the target folder but i can't
get jetty:run to work using that -->
+
<outputDirectory>src/main/webapp/embeddedContributions</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
Modified:
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml?rev=937250&r1=937249&r2=937250&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml
(original)
+++
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml
Fri Apr 23 11:09:39 2010
@@ -24,6 +24,16 @@
<display-name>Apache Tuscany Helloworld Sample</display-name>
+ <context-param>
+ <param-name>contributions</param-name>
+ <param-value>/embeddedContributions</param-value>
+ </context-param>
+
+ <init-param>
+ <param-name>contributions</param-name>
+ <param-value>/embeddedContributions</param-value>
+ </init-param>
+
<filter>
<filter-name>tuscany</filter-name>
<filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
Propchange:
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/src/main/webapp/embeddedContributions/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 23 11:09:39 2010
@@ -0,0 +1 @@
+*.*
