You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2007/10/26 20:02:04 UTC

svn commit: r588726 - in /geronimo/samples/trunk/samples: jsp-examples/jsp-examples-jetty/src/plan/ jsp-examples/jsp-examples-tomcat/src/plan/ jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/ ldap-sample-app/ldap-sample-app-war/src/main/webapp/WE...

Author: gawor
Date: Fri Oct 26 11:02:00 2007
New Revision: 588726

URL: http://svn.apache.org/viewvc?rev=588726&view=rev
Log:
more cleanup (updated module ids, and removed old plans)

Removed:
    geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/src/plan/
    geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/src/plan/
    geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/src/plan/
    geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/src/plan/
Modified:
    geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/geronimo-web.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-war/src/main/webapp/WEB-INF/geronimo-web.xml

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=588726&r1=588725&r2=588726&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 Fri Oct 26 11:02:00 2007
@@ -23,8 +23,8 @@
 
   <dep:environment>
     <dep:moduleId>
-      <dep:groupId>org.apache.geronimo.applications.examples</dep:groupId>
-      <dep:artifactId>geronimo-jsp-examples</dep:artifactId>
+      <dep:groupId>org.apache.geronimo.applications</dep:groupId>
+      <dep:artifactId>jsp-examples-war</dep:artifactId>
       <dep:version>2.1-SNAPSHOT</dep:version>
     </dep:moduleId>
     <dep:dependencies/>

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=588726&r1=588725&r2=588726&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 Fri Oct 26 11:02:00 2007
@@ -20,9 +20,9 @@
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
 	<environment>
 		<moduleId>
-			<groupId>samples</groupId>
-			<artifactId>LDAP_Sample</artifactId>
-			<version>1.2</version>
+			<groupId>org.apache.geronimo.applications</groupId>
+			<artifactId>ldap-sample-app-war</artifactId>
+			<version>2.1-SNAPSHOT</version>
 		</moduleId>		
 	</environment>
     <context-root>/LDAP_Sample</context-root>

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=588726&r1=588725&r2=588726&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 Fri Oct 26 11:02:00 2007
@@ -23,8 +23,8 @@
 
   <dep:environment>
     <dep:moduleId>
-      <dep:groupId>org.apache.geronimo.applications.examples</dep:groupId>
-      <dep:artifactId>geronimo-servlet-examples</dep:artifactId>
+      <dep:groupId>org.apache.geronimo.applications</dep:groupId>
+      <dep:artifactId>servlet-examples-war</dep:artifactId>
       <dep:version>2.1-SNAPSHOT</dep:version>
     </dep:moduleId>
     <dep:dependencies/>



Re: svn commit: r588726 - in /geronimo/samples/trunk/samples: jsp-examples/jsp-examples-jetty/src/plan/ jsp-examples/jsp-examples-tomcat/src/plan/ jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/ ldap-sample-app/ldap-sample-app-war/src/main/webapp/WE...

Posted by Donald Woods <dw...@apache.org>.
Shouldn't the groupId be org.apache.geronimo.samples instead of 
org.apache.geronimo.applications, to match the existing samples and 
directory name?

-Donald

gawor@apache.org wrote:
> Author: gawor
> Date: Fri Oct 26 11:02:00 2007
> New Revision: 588726
> 
> URL: http://svn.apache.org/viewvc?rev=588726&view=rev
> Log:
> more cleanup (updated module ids, and removed old plans)
> 
> Removed:
>     geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/src/plan/
>     geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/src/plan/
>     geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/src/plan/
>     geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/src/plan/
> Modified:
>     geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/geronimo-web.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-war/src/main/webapp/WEB-INF/geronimo-web.xml
> 
> 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=588726&r1=588725&r2=588726&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 Fri Oct 26 11:02:00 2007
> @@ -23,8 +23,8 @@
>  
>    <dep:environment>
>      <dep:moduleId>
> -      <dep:groupId>org.apache.geronimo.applications.examples</dep:groupId>
> -      <dep:artifactId>geronimo-jsp-examples</dep:artifactId>
> +      <dep:groupId>org.apache.geronimo.applications</dep:groupId>
> +      <dep:artifactId>jsp-examples-war</dep:artifactId>
>        <dep:version>2.1-SNAPSHOT</dep:version>
>      </dep:moduleId>
>      <dep:dependencies/>
> 
> 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=588726&r1=588725&r2=588726&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 Fri Oct 26 11:02:00 2007
> @@ -20,9 +20,9 @@
>  <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
>  	<environment>
>  		<moduleId>
> -			<groupId>samples</groupId>
> -			<artifactId>LDAP_Sample</artifactId>
> -			<version>1.2</version>
> +			<groupId>org.apache.geronimo.applications</groupId>
> +			<artifactId>ldap-sample-app-war</artifactId>
> +			<version>2.1-SNAPSHOT</version>
>  		</moduleId>		
>  	</environment>
>      <context-root>/LDAP_Sample</context-root>
> 
> 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=588726&r1=588725&r2=588726&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 Fri Oct 26 11:02:00 2007
> @@ -23,8 +23,8 @@
>  
>    <dep:environment>
>      <dep:moduleId>
> -      <dep:groupId>org.apache.geronimo.applications.examples</dep:groupId>
> -      <dep:artifactId>geronimo-servlet-examples</dep:artifactId>
> +      <dep:groupId>org.apache.geronimo.applications</dep:groupId>
> +      <dep:artifactId>servlet-examples-war</dep:artifactId>
>        <dep:version>2.1-SNAPSHOT</dep:version>
>      </dep:moduleId>
>      <dep:dependencies/>
> 
> 
>