Author: jsdelfino
Date: Sun Mar 16 21:01:43 2008
New Revision: 637713
URL: http://svn.apache.org/viewvc?rev=637713&view=rev
Log:
Moving files to the right folders to produce a correct WAR.
Added:
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/catalog-web.composite
(with props)
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/webapp/
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/webapp/META-INF/
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/webapp/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/webapp/WEB-INF/
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/webapp/WEB-INF/web.xml
(with props)
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/webapp/catalog.jsp
- copied unchanged from r637445,
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/catalog.jsp
Removed:
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/WEB-INF/
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/calatolog-jse.composite
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/catalog.jsp
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/services/
Modified:
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/pom.xml
Added:
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/catalog-web.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/catalog-web.composite?rev=637713&view=auto
==============================================================================
---
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/catalog-web.composite
(added)
+++
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/catalog-web.composite
Sun Mar 16 21:01:43 2008
@@ -0,0 +1,35 @@
+<?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://www.osoa.org/xmlns/sca/1.0";
+ targetNamespace="http://catalog";
+ name="catalog-web">
+
+ <component name="WebFruitsCatalog">
+ <implementation.java class="services.FruitsCatalogImpl"/>
+ <service name="Catalog">
+ <binding.ws/>
+ </service>
+ <property name="currencyCode">USD</property>
+ <reference name="currencyConverter" target="CloudCurrencyConverter">
+ <binding.ws/>
+ </reference>
+ </component>
+
+</composite>
Propchange:
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/catalog-web.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/catalog-web.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/pom.xml?rev=637713&r1=637712&r2=637713&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/pom.xml
(original)
+++ incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/pom.xml Sun
Mar 16 21:01:43 2008
@@ -52,13 +52,14 @@
<resources>
<resource>
<directory>${basedir}</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- <exclude>**/.*/**</exclude>
- <exclude>pom.xml</exclude>
- <exclude>build.xml</exclude>
- <exclude>target/**</exclude>
- </excludes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ <exclude>**/.*/**</exclude>
+ <exclude>pom.xml</exclude>
+ <exclude>build.xml</exclude>
+ <exclude>target/**</exclude>
+ <exclude>webapp/**</exclude>
+ </excludes>
</resource>
</resources>
@@ -67,8 +68,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <warSourceDirectory>.</warSourceDirectory>
- <warSourceExcludes>target/**,.*/**</warSourceExcludes>
+ <warSourceDirectory>webapp</warSourceDirectory>
</configuration>
</plugin>
<plugin>
Added:
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/webapp/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/webapp/META-INF/sca-contribution.xml?rev=637713&view=auto
==============================================================================
---
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/webapp/META-INF/sca-contribution.xml
(added)
+++
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/webapp/META-INF/sca-contribution.xml
Sun Mar 16 21:01:43 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";
+ xmlns:c="http://catalog";>
+ <import.java package="services"/>
+ <deployable composite="c:catalog-web"/>
+</contribution>
\ No newline at end of file
Added:
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/webapp/WEB-INF/web.xml?rev=637713&view=auto
==============================================================================
---
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/webapp/WEB-INF/web.xml
(added)
+++
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/webapp/WEB-INF/web.xml
Sun Mar 16 21:01:43 2008
@@ -0,0 +1,31 @@
+<?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>Fruit Catalog</display-name>
+
+ <welcome-file-list id="WelcomeFileList">
+ <welcome-file>catalog.jsp</welcome-file>
+ </welcome-file-list>
+
+</web-app>
Propchange:
incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
