geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r589259 - in /geronimo/samples/trunk/samples: jsp-examples/ jsp-examples/jsp-examples-jetty/ jsp-examples/jsp-examples-tomcat/ jsp-examples/jsp-examples-war/ jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/ ldap-sample-app/ldap-sample...
Date Sun, 28 Oct 2007 01:47:59 GMT
Author: gawor
Date: Sat Oct 27 18:47:58 2007
New Revision: 589259

URL: http://svn.apache.org/viewvc?rev=589259&view=rev
Log:
change groupid

Modified:
    geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml
    geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml
    geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml
    geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/trunk/samples/jsp-examples/pom.xml
    geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
    geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
    geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/pom.xml
    geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml
    geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml
    geronimo/samples/trunk/samples/servlet-examples/servlet-examples-war/pom.xml
    geronimo/samples/trunk/samples/servlet-examples/servlet-examples-war/src/main/webapp/WEB-INF/geronimo-web.xml

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml?rev=589259&r1=589258&r2=589259&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml Sat Oct 27 18:47:58
2007
@@ -39,16 +39,8 @@
 
     <dependencies>
 
-        <!--<dependency>-->
-        <!--<groupId>org.apache.geronimo.configs</groupId>-->
-        <!--<artifactId>jetty-deployer</artifactId>-->
-        <!--<version>${version}</version>-->
-        <!--<type>car</type>-->
-        <!--<scope>test</scope>-->
-        <!--</dependency>-->
-
         <dependency>
-            <groupId>org.apache.geronimo.applications</groupId>
+            <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>jsp-examples-war</artifactId>
             <version>${version}</version>
             <type>war</type>
@@ -62,6 +54,7 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
@@ -69,12 +62,14 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
+
     </dependencies>
 
     <build>
@@ -97,7 +92,7 @@
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
-                        <groupId>org.apache.geronimo.applications</groupId>
+                        <groupId>org.apache.geronimo.samples</groupId>
                         <artifactId>jsp-examples-war</artifactId>
                         <version>${version}</version>
                         <type>war</type>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml?rev=589259&r1=589258&r2=589259&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml Sat Oct 27 18:47:58
2007
@@ -40,7 +40,7 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.apache.geronimo.applications</groupId>
+            <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>jsp-examples-war</artifactId>
             <version>${version}</version>
             <type>war</type>
@@ -54,6 +54,7 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
@@ -61,12 +62,14 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
+
     </dependencies>
 
     <build>
@@ -89,7 +92,7 @@
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
-                        <groupId>org.apache.geronimo.applications</groupId>
+                        <groupId>org.apache.geronimo.samples</groupId>
                         <artifactId>jsp-examples-war</artifactId>
                         <version>${version}</version>
                         <type>war</type>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml?rev=589259&r1=589258&r2=589259&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml Sat Oct 27 18:47:58
2007
@@ -21,38 +21,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
-        <groupId>org.apache.geronimo.applications</groupId>
-        <artifactId>applications</artifactId>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>jsp-examples</artifactId>
         <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>jsp-examples-war</artifactId>
-    <name>Geronimo Applications, Examples :: JSP (JSR 152)</name>
+    <name>Geronimo Samples :: JSP Examples WAR</name>
     <packaging>war</packaging>
-    
-    <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsp_2.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>jstl</groupId>
-            <artifactId>jstl</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-    </dependencies>
     
     <build>
         <plugins>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=589259&r1=589258&r2=589259&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/geronimo-web.xml
Sat Oct 27 18:47:58 2007
@@ -23,9 +23,10 @@
 
   <dep:environment>
     <dep:moduleId>
-      <dep:groupId>org.apache.geronimo.applications</dep:groupId>
-      <dep:artifactId>jsp-examples-war</dep:artifactId>
-      <dep:version>2.1-SNAPSHOT</dep:version>
+      <dep:groupId>${pom.groupId}</dep:groupId>
+      <dep:artifactId>${pom.artifactId}</dep:artifactId>
+      <dep:version>${version}</dep:version>
+      <dep:type>war</dep:type>
     </dep:moduleId>
     <dep:dependencies/>
     <dep:hidden-classes/>

Modified: geronimo/samples/trunk/samples/jsp-examples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/pom.xml?rev=589259&r1=589258&r2=589259&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/pom.xml (original)
+++ geronimo/samples/trunk/samples/jsp-examples/pom.xml Sat Oct 27 18:47:58 2007
@@ -31,7 +31,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     
-    <artifactId>jspt-examples</artifactId>
+    <artifactId>jsp-examples</artifactId>
     <name>Geronimo Samples :: JSP Examples</name>
     <packaging>pom</packaging>
     

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml?rev=589259&r1=589258&r2=589259&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml Sat Oct 27
18:47:58 2007
@@ -43,7 +43,7 @@
     <dependencies>
         
         <dependency>
-            <groupId>org.apache.geronimo.applications</groupId>
+            <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>ldap-sample-app-war</artifactId>
             <version>${version}</version>
             <type>war</type>
@@ -100,7 +100,7 @@
                         <deploymentConfig>${jetty6Deployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
-                        <groupId>org.apache.geronimo.applications</groupId>
+                        <groupId>org.apache.geronimo.samples</groupId>
                         <artifactId>ldap-sample-app-war</artifactId>
                         <version>${version}</version>
                         <type>war</type>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml?rev=589259&r1=589258&r2=589259&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml Sat Oct
27 18:47:58 2007
@@ -43,7 +43,7 @@
     <dependencies>
         
         <dependency>
-            <groupId>org.apache.geronimo.applications</groupId>
+            <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>ldap-sample-app-war</artifactId>
             <version>${version}</version>
             <type>war</type>
@@ -100,7 +100,7 @@
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
-                        <groupId>org.apache.geronimo.applications</groupId>
+                        <groupId>org.apache.geronimo.samples</groupId>
                         <artifactId>ldap-sample-app-war</artifactId>
                         <version>${version}</version>
                         <type>war</type>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/pom.xml?rev=589259&r1=589258&r2=589259&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/pom.xml Sat Oct 27
18:47:58 2007
@@ -25,29 +25,18 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.applications</groupId>
-        <artifactId>applications</artifactId>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>ldap-sample-app</artifactId>
         <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>ldap-sample-app-war</artifactId>
-    <name>Geronimo Applications, Examples :: LDAP Demo</name>
+    <name>Geronimo Samples :: LDAP Sample WAR</name>
     <packaging>war</packaging>
 
-    <dependencies>
-    </dependencies>
-    
     <build>
         <plugins>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
-                    <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
-                </configuration>
-            </plugin>
 
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=589259&r1=589258&r2=589259&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/WEB-INF/geronimo-web.xml
Sat Oct 27 18:47:58 2007
@@ -20,9 +20,10 @@
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
 	<environment>
 		<moduleId>
-			<groupId>org.apache.geronimo.applications</groupId>
-			<artifactId>ldap-sample-app-war</artifactId>
-			<version>2.1-SNAPSHOT</version>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>${pom.artifactId}</artifactId>
+			<version>${version}</version>
+                        <type>war</type>
 		</moduleId>		
 	</environment>
     <context-root>/LDAP_Sample</context-root>

Modified: geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml?rev=589259&r1=589258&r2=589259&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml Sat Oct
27 18:47:58 2007
@@ -35,16 +35,9 @@
     <description>The Servlet examples originally developed for Tomcat. Can be found
via HTTP at /servlets-examples/ after installation. These examples give a basic introduction
to Servlet development along with sample code.</description> 
     
     <dependencies>
-        <!--<dependency>-->
-        <!--<groupId>org.apache.geronimo.configs</groupId>-->
-        <!--<artifactId>jetty-deployer</artifactId>-->
-        <!--<version>${version}</version>-->
-        <!--<type>car</type>-->
-        <!--<scope>test</scope>-->
-        <!--</dependency>-->
 
         <dependency>
-            <groupId>org.apache.geronimo.applications</groupId>
+            <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>servlet-examples-war</artifactId>
             <version>${version}</version>
             <type>war</type>
@@ -66,12 +59,14 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
+
     </dependencies>
 
     <build>
@@ -93,7 +88,7 @@
                         <deploymentConfig>${jetty6Deployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
-                        <groupId>org.apache.geronimo.applications</groupId>
+                        <groupId>org.apache.geronimo.samples</groupId>
                         <artifactId>servlet-examples-war</artifactId>
                         <version>${version}</version>
                         <type>war</type>

Modified: geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml?rev=589259&r1=589258&r2=589259&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml Sat Oct
27 18:47:58 2007
@@ -35,8 +35,9 @@
     <description>The Servlet examples originally developed for Tomcat. Can be found
via HTTP at /servlets-examples/ after installation. These examples give a basic introduction
to Servlet development along with sample code.</description> 
     
     <dependencies>
+
         <dependency>
-            <groupId>org.apache.geronimo.applications</groupId>
+            <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>servlet-examples-war</artifactId>
             <version>${version}</version>
             <type>war</type>
@@ -58,12 +59,14 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
+
     </dependencies>
     
     <build>
@@ -85,7 +88,7 @@
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
-                        <groupId>org.apache.geronimo.applications</groupId>
+                        <groupId>org.apache.geronimo.samples</groupId>
                         <artifactId>servlet-examples-war</artifactId>
                         <version>${version}</version>
                         <type>war</type>

Modified: geronimo/samples/trunk/samples/servlet-examples/servlet-examples-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/servlet-examples/servlet-examples-war/pom.xml?rev=589259&r1=589258&r2=589259&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/servlet-examples/servlet-examples-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/servlet-examples/servlet-examples-war/pom.xml Sat Oct 27
18:47:58 2007
@@ -23,24 +23,15 @@
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
-        <groupId>org.apache.geronimo.applications</groupId>
-        <artifactId>applications</artifactId>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>servlet-examples</artifactId>
         <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>servlet-examples-war</artifactId>
-    <name>Geronimo Applications, Examples :: Servlet (JSR 154)</name>
+    <name>Geronimo Samples :: Servlet Examples WAR</name>
     <packaging>war</packaging>
-    
-    <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-    </dependencies>
     
     <build>
         <plugins>

Modified: geronimo/samples/trunk/samples/servlet-examples/servlet-examples-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/servlet-examples/servlet-examples-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=589259&r1=589258&r2=589259&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/servlet-examples/servlet-examples-war/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/samples/trunk/samples/servlet-examples/servlet-examples-war/src/main/webapp/WEB-INF/geronimo-web.xml
Sat Oct 27 18:47:58 2007
@@ -23,9 +23,10 @@
 
   <dep:environment>
     <dep:moduleId>
-      <dep:groupId>org.apache.geronimo.applications</dep:groupId>
-      <dep:artifactId>servlet-examples-war</dep:artifactId>
-      <dep:version>2.1-SNAPSHOT</dep:version>
+      <dep:groupId>${pom.groupId}</dep:groupId>
+      <dep:artifactId>${pom.artifactId}</dep:artifactId>
+      <dep:version>${version}</dep:version>
+      <dep:type>war</dep:type>
     </dep:moduleId>
     <dep:dependencies/>
     <dep:hidden-classes/>



Mime
View raw message