diff options
Diffstat (limited to 'sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/src/main/webapp/WEB-INF')
2 files changed, 34 insertions, 12 deletions
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/src/main/webapp/WEB-INF/web.composite new file mode 100644 index 0000000000..0c03826f99 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/src/main/webapp/WEB-INF/web.composite @@ -0,0 +1,30 @@ +<?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.
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
+ targetNamespace="http://samples"
+ name="Helloworld">
+
+ <component name="foo">
+ <implementation.web web-uri=""/>
+ <reference name="service" target="HelloworldComponent"/>
+ </component>
+
+</composite>
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/src/main/webapp/WEB-INF/web.xml index 755162e305..b83a9c3417 100644 --- a/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/src/main/webapp/WEB-INF/web.xml +++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/src/main/webapp/WEB-INF/web.xml @@ -24,18 +24,6 @@ <display-name>Apache Tuscany Helloworld Sample</display-name> - <context-param> - <param-name>contributions</param-name> - <param-value>/WEB-INF/sca-contributions</param-value> - </context-param> - -<!-- TODO: need to sort out what to do about distributed domain - <context-param> - <param-name>org.apache.tuscany.sca.config</param-name> - <param-value>uri:default</param-value> - </context-param> ---> - <filter> <filter-name>tuscany</filter-name> <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> @@ -46,4 +34,8 @@ <url-pattern>/*</url-pattern> </filter-mapping> + <welcome-file-list id="WelcomeFileList"> + <welcome-file>hello.jsp</welcome-file> + </welcome-file-list> + </web-app> |