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/03/11 23:59:28 UTC
svn commit: r636141 - in /incubator/tuscany/java/sca:
demos/alert-aggregator-webapp/
demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/
samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/
samples/calculator-ws-webapp/src/main/webapp/WEB-IN...
Author: rfeng
Date: Tue Mar 11 15:59:15 2008
New Revision: 636141
URL: http://svn.apache.org/viewvc?rev=636141&view=rev
Log:
Update geronimo-web.xml
Modified:
incubator/tuscany/java/sca/demos/alert-aggregator-webapp/pom.xml
incubator/tuscany/java/sca/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
incubator/tuscany/java/sca/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
incubator/tuscany/java/sca/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
Modified: incubator/tuscany/java/sca/demos/alert-aggregator-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator-webapp/pom.xml?rev=636141&r1=636140&r2=636141&view=diff
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator-webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator-webapp/pom.xml Tue Mar 11 15:59:15 2008
@@ -319,6 +319,7 @@
<pingURL>http://localhost:8080/AlertsSourcesServiceJSONRPC</pingURL>
</deployable>
</deployables>
+ <home>${project.build.directory}/cargo-jetty</home>
</configuration>
</configuration>
</plugin>
Modified: incubator/tuscany/java/sca/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml?rev=636141&r1=636140&r2=636141&view=diff
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml Tue Mar 11 15:59:15 2008
@@ -17,17 +17,16 @@
* specific language governing permissions and limitations
* under the License.
-->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
- xmlns:d="http://geronimo.apache.org/xml/ns/deployment-1.1">
-
+<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.tuscany-demos</d:groupId>
+ <d:groupId>org.apache.tuscany.sca</d:groupId>
<d:artifactId>demo-alert-aggregator-webapp</d:artifactId>
<d:version>1.2-incubating-SNAPSHOT</d:version>
<d:type>war</d:type>
</d:moduleId>
<!-- TUSCANY-1986 -->
- <inverse-classloading />
+ <d:inverse-classloading />
</d:environment>
</web-app>
Modified: incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml?rev=636141&r1=636140&r2=636141&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml Tue Mar 11 15:59:15 2008
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
- xmlns:d="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<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>
@@ -28,6 +28,6 @@
<d:type>war</d:type>
</d:moduleId>
<!-- TUSCANY-1986 -->
- <inverse-classloading />
+ <d:inverse-classloading />
</d:environment>
</web-app>
Modified: incubator/tuscany/java/sca/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml?rev=636141&r1=636140&r2=636141&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ incubator/tuscany/java/sca/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml Tue Mar 11 15:59:15 2008
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
- xmlns:d="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<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>
@@ -27,7 +27,8 @@
<d:version>1.2-incubating-SNAPSHOT</d:version>
<d:type>war</d:type>
</d:moduleId>
+
<!-- TUSCANY-1986 -->
- <inverse-classloading />
+ <d:inverse-classloading />
</d:environment>
</web-app>
Modified: incubator/tuscany/java/sca/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml?rev=636141&r1=636140&r2=636141&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml Tue Mar 11 15:59:15 2008
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
- xmlns:d="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<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>
@@ -27,7 +27,15 @@
<d:version>1.2-incubating-SNAPSHOT</d:version>
<d:type>war</d:type>
</d:moduleId>
+ <!-- Using the shared library -->
+ <d:dependencies>
+ <d:dependency>
+ <d:groupId>org.apache.geronimo.configs</d:groupId>
+ <d:artifactId>sharedlib</d:artifactId>
+ </d:dependency>
+ </d:dependencies>
+
<!-- TUSCANY-1986 -->
- <inverse-classloading />
+ <d:inverse-classloading />
</d:environment>
</web-app>
Modified: incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml?rev=636141&r1=636140&r2=636141&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml Tue Mar 11 15:59:15 2008
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
- xmlns:d="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<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>
@@ -28,6 +28,6 @@
<d:type>war</d:type>
</d:moduleId>
<!-- TUSCANY-1986 -->
- <inverse-classloading />
+ <d:inverse-classloading />
</d:environment>
</web-app>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org