TUSCANY-3056 - Adding missing Geronimo deployment descriptors and fixing existent ones that were using inverse-classloading which was causing issues when deploying samples in geronimo environment

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@777397 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 196 insertions, 8 deletions

diff --git a/branches/sca-java-1.x/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/branches/sca-java-1.x/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 4f74273881..7b2dc6b73a 100644
--- a/branches/sca-java-1.x/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/branches/sca-java-1.x/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -27,7 +27,14 @@
             <d:version>1.6-SNAPSHOT</d:version>

             <d:type>war</d:type>

         </d:moduleId>

-        <!-- TUSCANY-1986 -->

-        <d:inverse-classloading />

+

+		<!-- TUSCANY-2622 -->

+		<d:hidden-classes>

+			<d:filter>org.apache.axiom</d:filter>

+			<d:filter>org.apache.axis2</d:filter>

+			<d:filter>org.apache.commons</d:filter>

+			<d:filter>org.jdom</d:filter>

+		</d:hidden-classes>		

+

     </d:environment>

 </web-app>

diff --git a/branches/sca-java-1.x/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/branches/sca-java-1.x/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index d040b70bf2..344baeb738 100644
--- a/branches/sca-java-1.x/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/branches/sca-java-1.x/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -28,7 +28,13 @@
             <d:type>war</d:type>
         </d:moduleId>
 
-        <!-- TUSCANY-1986 -->
-        <d:inverse-classloading />
+		<!-- TUSCANY-2622 -->
+		<d:hidden-classes>
+			<d:filter>org.apache.axiom</d:filter>
+			<d:filter>org.apache.axis2</d:filter>
+			<d:filter>org.apache.commons</d:filter>
+			<d:filter>org.jdom</d:filter>
+		</d:hidden-classes>		
+
     </d:environment>
 </web-app>
diff --git a/branches/sca-java-1.x/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/branches/sca-java-1.x/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 0e06a2f80b..544e4b96c9 100644
--- a/branches/sca-java-1.x/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/branches/sca-java-1.x/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -28,7 +28,13 @@
             <d:type>war</d:type>
         </d:moduleId>
 
-        <!-- TUSCANY-1986 -->
-        <d:inverse-classloading />
+		<!-- TUSCANY-2622 -->
+		<d:hidden-classes>
+			<d:filter>org.apache.axiom</d:filter>
+			<d:filter>org.apache.axis2</d:filter>
+			<d:filter>org.apache.commons</d:filter>
+			<d:filter>org.jdom</d:filter>
+		</d:hidden-classes>	
+		
     </d:environment>
 </web-app>
diff --git a/branches/sca-java-1.x/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/branches/sca-java-1.x/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
new file mode 100644
index 0000000000..59429d2fa6
--- /dev/null
+++ b/branches/sca-java-1.x/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -0,0 +1,40 @@
+<?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 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</d:groupId>
+            <d:artifactId>sample-feed-aggregator-webapp</d:artifactId>
+            <d:version>1.5-SNAPSHOT</d:version>
+            <d:type>war</d:type>
+        </d:moduleId>
+
+		<!-- TUSCANY-2622 -->
+		<d:hidden-classes>
+			<d:filter>org.apache.axiom</d:filter>
+			<d:filter>org.apache.axis2</d:filter>
+			<d:filter>org.apache.commons</d:filter>
+			<d:filter>org.jdom</d:filter>
+		</d:hidden-classes>	
+		
+    </d:environment>
+</web-app>
diff --git a/branches/sca-java-1.x/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/branches/sca-java-1.x/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
new file mode 100644
index 0000000000..98f4a98bfd
--- /dev/null
+++ b/branches/sca-java-1.x/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -0,0 +1,40 @@
+<?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 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</d:groupId>
+            <d:artifactId>sample-helloworld-dojo-webapp</d:artifactId>
+            <d:version>1.5-SNAPSHOT</d:version>
+            <d:type>war</d:type>
+        </d:moduleId>
+
+		<!-- TUSCANY-2622 -->
+		<d:hidden-classes>
+			<d:filter>org.apache.axiom</d:filter>
+			<d:filter>org.apache.axis2</d:filter>
+			<d:filter>org.apache.commons</d:filter>
+			<d:filter>org.jdom</d:filter>
+		</d:hidden-classes>	
+		
+    </d:environment>
+</web-app>
diff --git a/branches/sca-java-1.x/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/branches/sca-java-1.x/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
new file mode 100644
index 0000000000..4ce36a1181
--- /dev/null
+++ b/branches/sca-java-1.x/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -0,0 +1,40 @@
+<?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 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</d:groupId>
+            <d:artifactId>sample-helloworld-jms-webapp</d:artifactId>
+            <d:version>1.5-SNAPSHOT</d:version>
+            <d:type>war</d:type>
+        </d:moduleId>
+
+		<!-- TUSCANY-2622 -->
+		<d:hidden-classes>
+			<d:filter>org.apache.axiom</d:filter>
+			<d:filter>org.apache.axis2</d:filter>
+			<d:filter>org.apache.commons</d:filter>
+			<d:filter>org.jdom</d:filter>
+		</d:hidden-classes>	
+		
+    </d:environment>
+</web-app>
diff --git a/branches/sca-java-1.x/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/branches/sca-java-1.x/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
new file mode 100644
index 0000000000..301b18a227
--- /dev/null
+++ b/branches/sca-java-1.x/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -0,0 +1,40 @@
+<?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 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</d:groupId>
+            <d:artifactId>sample-helloworld-jsonrpc-webapp</d:artifactId>
+            <d:version>1.5-SNAPSHOT</d:version>
+            <d:type>war</d:type>
+        </d:moduleId>
+
+		<!-- TUSCANY-2622 -->
+		<d:hidden-classes>
+			<d:filter>org.apache.axiom</d:filter>
+			<d:filter>org.apache.axis2</d:filter>
+			<d:filter>org.apache.commons</d:filter>
+			<d:filter>org.jdom</d:filter>
+		</d:hidden-classes>	
+		
+    </d:environment>
+</web-app>
diff --git a/branches/sca-java-1.x/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/branches/sca-java-1.x/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index d6e3804f91..08570705b0 100644
--- a/branches/sca-java-1.x/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/branches/sca-java-1.x/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -27,6 +27,7 @@
             <d:version>1.6-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
+        
         <!-- Using the shared library -->
         <d:dependencies>
             <d:dependency>
@@ -35,7 +36,13 @@
             </d:dependency>
         </d:dependencies>
 
-        <!-- TUSCANY-1986 -->
-        <d:inverse-classloading />
+		<!-- TUSCANY-2622 -->
+		<d:hidden-classes>
+			<d:filter>org.apache.axiom</d:filter>
+			<d:filter>org.apache.axis2</d:filter>
+			<d:filter>org.apache.commons</d:filter>
+			<d:filter>org.jdom</d:filter>
+		</d:hidden-classes>	
+		
     </d:environment>
 </web-app>
diff --git a/branches/sca-java-1.x/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/branches/sca-java-1.x/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 4d72db7e87..d191961f95 100644
--- a/branches/sca-java-1.x/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/branches/sca-java-1.x/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -36,6 +36,7 @@
 			<dep:version>1.0</dep:version>
 			<dep:type>car</dep:type>
 		</dep:moduleId>
+		
 		<!-- TUSCANY-2622 -->
 		<dep:hidden-classes>
 			<dep:filter>org.apache.axiom</dep:filter>
@@ -43,6 +44,7 @@
 			<dep:filter>org.apache.commons</dep:filter>
 			<dep:filter>org.jdom</dep:filter>
 		</dep:hidden-classes>		
+		
 	</dep:environment>
 	<web:context-root>/sample-store-secure-webapp</web:context-root>
 </web:web-app>