geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r942071 - in /geronimo/samples/trunk/samples/javaee6: ./ converter-javaee6/converter-javaee6-jetty/src/main/plan/ converter-javaee6/converter-javaee6-tomcat/src/main/plan/ cviewer-javaee6/cviewer-javaee6-war/src/main/webapp/WEB-INF/ ejbtime...
Date Fri, 07 May 2010 13:41:27 GMT
Author: xiaming
Date: Fri May  7 13:41:26 2010
New Revision: 942071

URL: http://svn.apache.org/viewvc?rev=942071&view=rev
Log:
Update javaee6 samples' plugins plan.xml

Added:
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
  (with props)
Modified:
    geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-jetty/src/main/plan/plan.xml
    geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-tomcat/src/main/plan/plan.xml
    geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-jetty/pom.xml
    geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-jetty/src/main/plan/plan.xml
    geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-tomcat/pom.xml
    geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-tomcat/src/main/plan/plan.xml
    geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-jetty/pom.xml
    geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-jetty/src/main/plan/plan.xml
    geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-tomcat/pom.xml
    geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-tomcat/src/main/plan/plan.xml
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml
    geronimo/samples/trunk/samples/javaee6/pom.xml
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/pom.xml
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/src/main/plan/plan.xml
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/pom.xml
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/src/main/plan/plan.xml
    geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-jetty/pom.xml
    geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-jetty/src/main/plan/plan.xml
    geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/pom.xml
    geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/src/main/plan/plan.xml
    geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml

Modified: geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-jetty/src/main/plan/plan.xml?rev=942071&r1=942070&r2=942071&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-jetty/src/main/plan/plan.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-jetty/src/main/plan/plan.xml
Fri May  7 13:41:26 2010
@@ -19,15 +19,15 @@
 -->
 
 <!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
-         xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
-         xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" 
+         xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" 
+         xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" 
          xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
   <sys:environment>
     <sys:moduleId>
       <sys:groupId>${pom.groupId}</sys:groupId>
-      <sys:artifactId>converter-javaee6</sys:artifactId>
+      <sys:artifactId>${pom.artifactId}</sys:artifactId>
       <sys:version>${version}</sys:version>
       <sys:type>car</sys:type>
     </sys:moduleId>
@@ -36,6 +36,6 @@
     <sys:non-overridable-classes/>
   </sys:environment>
 
-  <context-root>/converter-javaee6</context-root>
+  <context-root>/${pom.artifactId}</context-root>
 
 </web-app>

Modified: geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-tomcat/src/main/plan/plan.xml?rev=942071&r1=942070&r2=942071&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-tomcat/src/main/plan/plan.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-tomcat/src/main/plan/plan.xml
Fri May  7 13:41:26 2010
@@ -26,8 +26,8 @@
 
   <sys:environment>
     <sys:moduleId>
-      <sys:groupId>org.apache.geronimo.samples</sys:groupId>
-      <sys:artifactId>converter-javaee6</sys:artifactId>
+      <sys:groupId>${pom.groupId}</sys:groupId>
+      <sys:artifactId>${pom.artifactId}</sys:artifactId>
       <sys:version>${version}</sys:version>
       <sys:type>car</sys:type>
     </sys:moduleId>
@@ -36,6 +36,6 @@
     <sys:non-overridable-classes/>
   </sys:environment>
 
-  <context-root>/converter-javaee6</context-root>
+  <context-root>/${pom.artifactId}</context-root>
 
 </web-app>

Modified: geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=942071&r1=942070&r2=942071&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
Fri May  7 13:41:26 2010
@@ -1,3 +1,23 @@
+<?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.1" 
          xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" 
          xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" 

Modified: geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-jetty/pom.xml?rev=942071&r1=942070&r2=942071&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-jetty/pom.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-jetty/pom.xml
Fri May  7 13:41:26 2010
@@ -39,9 +39,9 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>ejbtimer-javaee6-ear</artifactId>
-            <version>3.0-SNAPSHOT</version>
-            <type>ear</type>
+            <artifactId>ejbtimer-javaee6-war</artifactId>
+            <version>${version}</version>
+            <type>war</type>
         </dependency>
 
         <dependency>
@@ -108,15 +108,14 @@
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.samples</groupId>
-                        <artifactId>ejbtimer-javaee6-ear</artifactId>
-                        <version>3.0-SNAPSHOT</version>
-                        <type>ear</type>
+                        <artifactId>ejbtimer-javaee6-war</artifactId>
+                        <version>${version}</version>
+                        <type>war</type>
                     </module>
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-jetty/src/main/plan/plan.xml?rev=942071&r1=942070&r2=942071&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-jetty/src/main/plan/plan.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-jetty/src/main/plan/plan.xml
Fri May  7 13:41:26 2010
@@ -19,16 +19,23 @@
 -->
 
 <!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" 
+         xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" 
+         xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" 
+         xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>3.0-SNAPSHOT</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
+  <sys:environment>
+    <sys:moduleId>
+      <sys:groupId>${pom.groupId}</sys:groupId>
+      <sys:artifactId>${pom.artifactId}</sys:artifactId>
+      <sys:version>${version}</sys:version>
+      <sys:type>car</sys:type>
+    </sys:moduleId>
+    <sys:dependencies/>
+    <sys:hidden-classes/>
+    <sys:non-overridable-classes/>
+  </sys:environment>
 
-   </dep:environment>
-   
-</application>
+  <context-root>/${pom.artifactId}</context-root>
+
+</web-app>

Modified: geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-tomcat/pom.xml?rev=942071&r1=942070&r2=942071&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-tomcat/pom.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-tomcat/pom.xml
Fri May  7 13:41:26 2010
@@ -39,9 +39,9 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>ejbtimer-javaee6-ear</artifactId>
-            <version>3.0-SNAPSHOT</version>
-            <type>ear</type>
+            <artifactId>ejbtimer-javaee6-war</artifactId>
+            <version>${version}</version>
+            <type>war</type>
         </dependency>
         
         <dependency>
@@ -108,15 +108,14 @@
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.samples</groupId>
-                        <artifactId>ejbtimer-javaee6-ear</artifactId>
-                        <version>3.0-SNAPSHOT</version>
-                        <type>ear</type>
+                        <artifactId>ejbtimer-javaee6-war</artifactId>
+                        <version>${version}</version>
+                        <type>war</type>
                     </module>
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-tomcat/src/main/plan/plan.xml?rev=942071&r1=942070&r2=942071&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-tomcat/src/main/plan/plan.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-tomcat/src/main/plan/plan.xml
Fri May  7 13:41:26 2010
@@ -19,16 +19,23 @@
 -->
 
 <!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" 
+         xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" 
+         xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" 
+         xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>3.0-SNAPSHOT</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
+  <sys:environment>
+    <sys:moduleId>
+      <sys:groupId>${pom.groupId}</sys:groupId>
+      <sys:artifactId>${pom.artifactId}</sys:artifactId>
+      <sys:version>${version}</sys:version>
+      <sys:type>car</sys:type>
+    </sys:moduleId>
+    <sys:dependencies/>
+    <sys:hidden-classes/>
+    <sys:non-overridable-classes/>
+  </sys:environment>
 
-   </dep:environment>
-   
-</application>
+  <context-root>/${pom.artifactId}</context-root>
+
+</web-app>

Modified: geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-jetty/pom.xml?rev=942071&r1=942070&r2=942071&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-jetty/pom.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-jetty/pom.xml
Fri May  7 13:41:26 2010
@@ -38,7 +38,12 @@
     <description>Geronimo Samples. fileupload-javaee6 Plugin for Jetty</description>
 
     <dependencies>
-
+        <dependency>
+            <groupId>org.apache.geronimo.samples</groupId>
+            <artifactId>fileupload-javaee6-war</artifactId>
+            <version>${version}</version>
+            <type>war</type>
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>${jetty}-deployer</artifactId>
@@ -103,9 +108,9 @@
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.samples</groupId>
-                        <artifactId>fileupload-javaee6-ear</artifactId>
-                        <version>3.0-SNAPSHOT</version>
-                        <type>ear</type>
+                        <artifactId>fileupload-javaee6-war</artifactId>
+                        <version>${version}</version>
+                        <type>war</type>
                     </module>
                     <useMavenDependencies>
                         <value>true</value>

Modified: geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-jetty/src/main/plan/plan.xml?rev=942071&r1=942070&r2=942071&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-jetty/src/main/plan/plan.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-jetty/src/main/plan/plan.xml
Fri May  7 13:41:26 2010
@@ -19,15 +19,15 @@
 -->
 
 <!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
-         xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
-         xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" 
+         xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" 
+         xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" 
          xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
   <sys:environment>
     <sys:moduleId>
       <sys:groupId>${pom.groupId}</sys:groupId>
-      <sys:artifactId>fileupload-javaee6</sys:artifactId>
+      <sys:artifactId>${pom.artifactId}</sys:artifactId>
       <sys:version>${version}</sys:version>
       <sys:type>car</sys:type>
     </sys:moduleId>
@@ -36,6 +36,6 @@
     <sys:non-overridable-classes/>
   </sys:environment>
 
-  <context-root>/fileupload-javaee6</context-root>
+  <context-root>/${pom.artifactId}</context-root>
 
 </web-app>

Modified: geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-tomcat/pom.xml?rev=942071&r1=942070&r2=942071&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-tomcat/pom.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-tomcat/pom.xml
Fri May  7 13:41:26 2010
@@ -38,7 +38,13 @@
     <description>Geronimo Samples. fileupload-javaee6 Plugin for Tomcat</description>
 
     <dependencies>
-        
+        <dependency>
+            <groupId>org.apache.geronimo.samples</groupId>
+            <artifactId>fileupload-javaee6-war</artifactId>
+            <version>${version}</version>
+            <type>war</type>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat7-deployer</artifactId>
@@ -101,6 +107,12 @@
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
                         <deploymentConfig>${jpaDeployer}</deploymentConfig>
                     </deploymentConfigs>
+                    <module>
+                        <groupId>org.apache.geronimo.samples</groupId>
+                        <artifactId>fileupload-javaee6-war</artifactId>
+                        <version>${version}</version>
+                        <type>war</type>
+                    </module>
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>

Modified: geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-tomcat/src/main/plan/plan.xml?rev=942071&r1=942070&r2=942071&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-tomcat/src/main/plan/plan.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-tomcat/src/main/plan/plan.xml
Fri May  7 13:41:26 2010
@@ -19,15 +19,15 @@
 -->
 
 <!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
-         xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
-         xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" 
+         xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" 
+         xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" 
          xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
   <sys:environment>
     <sys:moduleId>
       <sys:groupId>${pom.groupId}</sys:groupId>
-      <sys:artifactId>fileupload-javaee6</sys:artifactId>
+      <sys:artifactId>${pom.artifactId}</sys:artifactId>
       <sys:version>${version}</sys:version>
       <sys:type>car</sys:type>
     </sys:moduleId>
@@ -36,6 +36,6 @@
     <sys:non-overridable-classes/>
   </sys:environment>
 
-  <context-root>/fileupload-javaee6</context-root>
+  <context-root>/${pom.artifactId}</context-root>
 
 </web-app>

Modified: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml?rev=942071&r1=942070&r2=942071&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml
Fri May  7 13:41:26 2010
@@ -23,8 +23,10 @@
     <exclude-unlisted-classes>true</exclude-unlisted-classes>
     <properties>
       <property name="openjpa.jdbc.DBDictionary " value="derby"/>
-      <property name="openjpa.ConnectionURL" value="jdbc:derby://localhost:1527/jpa20demodb"/>
-      <property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.ClientDriver"/>
+      <!--<property name="openjpa.ConnectionURL" value="jdbc:derby://localhost:1527/jpa20demodb"/>
+      <property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.ClientDriver"/>-->
+<property name="openjpa.ConnectionURL" value="jdbc:derby:jpa20demodb"/>
+      <property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.EmbeddedDriver"/>
       <property name="openjpa.ConnectionUserName" value="APP"/>
       <property name="openjpa.ConnectionPassword" value="APP"/>      
       <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=1)"/>
     

Modified: geronimo/samples/trunk/samples/javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/pom.xml?rev=942071&r1=942070&r2=942071&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/pom.xml Fri May  7 13:41:26 2010
@@ -163,6 +163,7 @@
                 <module>jarresource-javaee6</module>
                 <module>webfragment-javaee6</module>
                 <module>singletonejb-javaee6</module>
+				<module>restfulorder-javaee6</module>
             </modules>
         </profile>
         <profile>
@@ -183,6 +184,7 @@
                 <module>jarresource-javaee6</module>
                 <module>webfragment-javaee6</module>
                 <module>singletonejb-javaee6</module>
+				<module>restfulorder-javaee6</module>
             </modules>
         </profile>
     </profiles>  

Modified: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/pom.xml?rev=942071&r1=942070&r2=942071&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/pom.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/pom.xml
Fri May  7 13:41:26 2010
@@ -37,7 +37,12 @@
     <description>Geronimo Samples. singletonejb-javaee6 Plugin for Jetty</description>
 
     <dependencies>
-        
+        <dependency>
+            <groupId>org.apache.geronimo.samples</groupId>
+            <artifactId>singletonejb-javaee6-war</artifactId>
+            <version>${version}</version>
+            <type>war</type>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -101,12 +106,16 @@
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
                         <deploymentConfig>${jpaDeployer}</deploymentConfig>
                     </deploymentConfigs>
-              
+                    <module>
+                        <groupId>org.apache.geronimo.samples</groupId>
+                        <artifactId>singletonejb-javaee6-war</artifactId>
+                        <version>${version}</version>
+                        <type>war</type>
+                    </module>
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/src/main/plan/plan.xml?rev=942071&r1=942070&r2=942071&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/src/main/plan/plan.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/src/main/plan/plan.xml
Fri May  7 13:41:26 2010
@@ -19,16 +19,23 @@
 -->
 
 <!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" 
+         xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" 
+         xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" 
+         xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>3.0-SNAPSHOT</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
+  <sys:environment>
+    <sys:moduleId>
+      <sys:groupId>${pom.groupId}</sys:groupId>
+      <sys:artifactId>${pom.artifactId}</sys:artifactId>
+      <sys:version>${version}</sys:version>
+      <sys:type>car</sys:type>
+    </sys:moduleId>
+    <sys:dependencies/>
+    <sys:hidden-classes/>
+    <sys:non-overridable-classes/>
+  </sys:environment>
 
-   </dep:environment>
-   
-</application>
+  <context-root>/${pom.artifactId}</context-root>
+
+</web-app>

Modified: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/pom.xml?rev=942071&r1=942070&r2=942071&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/pom.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/pom.xml
Fri May  7 13:41:26 2010
@@ -37,7 +37,13 @@
     <description>Geronimo Samples. singletonejb-javaee6 Plugin for Tomcat</description>
 
     <dependencies>
-        
+        <dependency>
+            <groupId>org.apache.geronimo.samples</groupId>
+            <artifactId>singletonejb-javaee6-war</artifactId>
+            <version>${version}</version>
+            <type>war</type>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat7-deployer</artifactId>
@@ -100,12 +106,16 @@
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
                         <deploymentConfig>${jpaDeployer}</deploymentConfig>
                     </deploymentConfigs>
-               
+                    <module>
+                        <groupId>org.apache.geronimo.samples</groupId>
+                        <artifactId>singletonejb-javaee6-war</artifactId>
+                        <version>${version}</version>
+                        <type>war</type>
+                    </module>
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/src/main/plan/plan.xml?rev=942071&r1=942070&r2=942071&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/src/main/plan/plan.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/src/main/plan/plan.xml
Fri May  7 13:41:26 2010
@@ -19,16 +19,23 @@
 -->
 
 <!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" 
+         xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" 
+         xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" 
+         xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>3.0-SNAPSHOT</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
+  <sys:environment>
+    <sys:moduleId>
+      <sys:groupId>${pom.groupId}</sys:groupId>
+      <sys:artifactId>${pom.artifactId}</sys:artifactId>
+      <sys:version>${version}</sys:version>
+      <sys:type>car</sys:type>
+    </sys:moduleId>
+    <sys:dependencies/>
+    <sys:hidden-classes/>
+    <sys:non-overridable-classes/>
+  </sys:environment>
 
-   </dep:environment>
-   
-</application>
+  <context-root>/${pom.artifactId}</context-root>
+
+</web-app>

Added: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=942071&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
(added)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
Fri May  7 13:41:26 2010
@@ -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.1" 
+         xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" 
+         xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" 
+         xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+  <sys:environment>
+    <sys:moduleId>
+      <sys:groupId>org.apache.geronimo.samples</sys:groupId>
+      <sys:artifactId>singletonejb-javaee6</sys:artifactId>
+      <sys:version>${version}</sys:version>
+      <sys:type>car</sys:type>
+    </sys:moduleId>
+    <sys:dependencies/>
+    <sys:hidden-classes/>
+    <sys:non-overridable-classes/>
+  </sys:environment>
+
+  <context-root>/singletonejb-javaee6</context-root>
+
+</web-app>

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-jetty/pom.xml?rev=942071&r1=942070&r2=942071&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-jetty/pom.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-jetty/pom.xml
Fri May  7 13:41:26 2010
@@ -116,7 +116,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-jetty/src/main/plan/plan.xml?rev=942071&r1=942070&r2=942071&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-jetty/src/main/plan/plan.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-jetty/src/main/plan/plan.xml
Fri May  7 13:41:26 2010
@@ -19,16 +19,23 @@
 -->
 
 <!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" 
+         xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" 
+         xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" 
+         xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>3.0-SNAPSHOT</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
+  <sys:environment>
+    <sys:moduleId>
+      <sys:groupId>${pom.groupId}</sys:groupId>
+      <sys:artifactId>${pom.artifactId}</sys:artifactId>
+      <sys:version>${version}</sys:version>
+      <sys:type>car</sys:type>
+    </sys:moduleId>
+    <sys:dependencies/>
+    <sys:hidden-classes/>
+    <sys:non-overridable-classes/>
+  </sys:environment>
 
-   </dep:environment>
-   
-</application>
+  <context-root>/${pom.artifactId}</context-root>
+
+</web-app>

Modified: geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/pom.xml?rev=942071&r1=942070&r2=942071&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/pom.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/pom.xml
Fri May  7 13:41:26 2010
@@ -46,7 +46,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-deployer</artifactId>
+            <artifactId>tomcat7-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -116,7 +116,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/src/main/plan/plan.xml?rev=942071&r1=942070&r2=942071&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/src/main/plan/plan.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/src/main/plan/plan.xml
Fri May  7 13:41:26 2010
@@ -19,16 +19,23 @@
 -->
 
 <!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" 
+         xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" 
+         xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" 
+         xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>3.0-SNAPSHOT</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
+  <sys:environment>
+    <sys:moduleId>
+      <sys:groupId>${pom.groupId}</sys:groupId>
+      <sys:artifactId>${pom.artifactId}</sys:artifactId>
+      <sys:version>${version}</sys:version>
+      <sys:type>car</sys:type>
+    </sys:moduleId>
+    <sys:dependencies/>
+    <sys:hidden-classes/>
+    <sys:non-overridable-classes/>
+  </sys:environment>
 
-   </dep:environment>
-   
-</application>
+  <context-root>/${pom.artifactId}</context-root>
+
+</web-app>

Modified: geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=942071&r1=942070&r2=942071&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
Fri May  7 13:41:26 2010
@@ -25,9 +25,9 @@ under the License.
 
   <sys:environment>
     <sys:moduleId>
-      <sys:groupId>org.geronimo.samples</sys:groupId>
-      <sys:artifactId>FragmentDemo</sys:artifactId>
-      <sys:version>3.0</sys:version>
+      <sys:groupId>org.apache.geronimo.samples</sys:groupId>
+      <sys:artifactId>webfragment-javaee6</sys:artifactId>
+      <sys:version>${version}</sys:version>
       <sys:type>car</sys:type>
     </sys:moduleId>
     <sys:dependencies/>



Mime
View raw message