You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by hc...@apache.org on 2008/03/20 23:04:51 UTC
svn commit: r639479 - in /geronimo/samples/branches/2.1/samples/inventory:
inventory-ear/src/main/resources/META-INF/geronimo-application.xml
inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
Author: hcunico
Date: Thu Mar 20 15:04:49 2008
New Revision: 639479
URL: http://svn.apache.org/viewvc?rev=639479&view=rev
Log:
updated target name spaces in dep plans.
Modified:
geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml
geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml?rev=639479&r1=639478&r2=639479&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml Thu Mar 20 15:04:49 2008
@@ -20,9 +20,9 @@
<!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <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>
Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=639479&r1=639478&r2=639479&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml Thu Mar 20 15:04:49 2008
@@ -18,7 +18,7 @@
under the License.
-->
<web-app
- xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
+ xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
<environment>
<moduleId>
Re: svn commit: r639479 - in /geronimo/samples/branches/2.1/samples/inventory:
inventory-ear/src/main/resources/META-INF/geronimo-application.xml inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
Posted by Hernan Cunico <hc...@gmail.com>.
Oh, OK, thx.
Cheers!
Hernan
Jarek Gawor wrote:
> I just added them to trunk two days ago and I'm thinking about merging
> them to branches/2.1 at one point.
>
> Jarek
>
> On Mon, Mar 24, 2008 at 10:40 AM, Hernan Cunico <hc...@gmail.com> wrote:
>> hmmm, is this only needed on trunk? I mean we don't have these on on the branch
>>
>>
>>
>> Cheers!
>> Hernan
>>
>> Jarek Gawor wrote:
>> > Cool, thanks.
>> >
>> > The *-jetty and *-tomcat modules are the plugins for the given sample.
>> > As far as I know there is no easy way to have one module and have it
>> > generate two plugins or a single plugin that works with both
>> > distributions.
>> >
>> > Jarek
>> >
>> > On Mon, Mar 24, 2008 at 9:48 AM, Hernan Cunico <hc...@gmail.com> wrote:
>> >> My bad, meant to do that but got distracted, I'm updating trunk now.
>> >>
>> >> quick question though, why do we have a Jetty and a Tomcat version of the same app on trunk?
>> >>
>> >> Cheers!
>> >> Hernan
>> >>
>> >>
>> >>
>> >> Jarek Gawor wrote:
>> >> > Hernan,
>> >> >
>> >> > In case I missed it, can you also merge these changes to trunk?
>> >> >
>> >> > Thanks,
>> >> > Jarek
>> >> >
>> >> > On Thu, Mar 20, 2008 at 6:04 PM, <hc...@apache.org> wrote:
>> >> >> Author: hcunico
>> >> >> Date: Thu Mar 20 15:04:49 2008
>> >> >> New Revision: 639479
>> >> >>
>> >> >> URL: http://svn.apache.org/viewvc?rev=639479&view=rev
>> >> >> Log:
>> >> >> updated target name spaces in dep plans.
>> >> >>
>> >> >> Modified:
>> >> >> geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml
>> >> >> geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
>> >> >>
>> >> >> Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml
>> >> >> URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml?rev=639479&r1=639478&r2=639479&view=diff
>> >> >> ==============================================================================
>> >> >> --- geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml (original)
>> >> >> +++ geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml Thu Mar 20 15:04:49 2008
>> >> >> @@ -20,9 +20,9 @@
>> >> >>
>> >> >> <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
>> >> >>
>> >> >> -<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
>> >> >> +<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
>> >> >>
>> >> >> - <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
>> >> >> + <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>
>> >> >>
>> >> >> Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
>> >> >> URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=639479&r1=639478&r2=639479&view=diff
>> >> >> ==============================================================================
>> >> >> --- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
>> >> >> +++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml Thu Mar 20 15:04:49 2008
>> >> >> @@ -18,7 +18,7 @@
>> >> >> under the License.
>> >> >> -->
>> >> >> <web-app
>> >> >> - xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
>> >> >> + xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
>> >> >>
>> >> >> <environment>
>> >> >> <moduleId>
>> >> >>
>> >> >>
>> >> >>
>> >> >
>> >>
>> >
>>
>
Re: svn commit: r639479 - in /geronimo/samples/branches/2.1/samples/inventory: inventory-ear/src/main/resources/META-INF/geronimo-application.xml inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
Posted by Jarek Gawor <jg...@gmail.com>.
I just added them to trunk two days ago and I'm thinking about merging
them to branches/2.1 at one point.
Jarek
On Mon, Mar 24, 2008 at 10:40 AM, Hernan Cunico <hc...@gmail.com> wrote:
> hmmm, is this only needed on trunk? I mean we don't have these on on the branch
>
>
>
> Cheers!
> Hernan
>
> Jarek Gawor wrote:
> > Cool, thanks.
> >
> > The *-jetty and *-tomcat modules are the plugins for the given sample.
> > As far as I know there is no easy way to have one module and have it
> > generate two plugins or a single plugin that works with both
> > distributions.
> >
> > Jarek
> >
> > On Mon, Mar 24, 2008 at 9:48 AM, Hernan Cunico <hc...@gmail.com> wrote:
> >> My bad, meant to do that but got distracted, I'm updating trunk now.
> >>
> >> quick question though, why do we have a Jetty and a Tomcat version of the same app on trunk?
> >>
> >> Cheers!
> >> Hernan
> >>
> >>
> >>
> >> Jarek Gawor wrote:
> >> > Hernan,
> >> >
> >> > In case I missed it, can you also merge these changes to trunk?
> >> >
> >> > Thanks,
> >> > Jarek
> >> >
> >> > On Thu, Mar 20, 2008 at 6:04 PM, <hc...@apache.org> wrote:
> >> >> Author: hcunico
> >> >> Date: Thu Mar 20 15:04:49 2008
> >> >> New Revision: 639479
> >> >>
> >> >> URL: http://svn.apache.org/viewvc?rev=639479&view=rev
> >> >> Log:
> >> >> updated target name spaces in dep plans.
> >> >>
> >> >> Modified:
> >> >> geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml
> >> >> geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
> >> >>
> >> >> Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml
> >> >> URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml?rev=639479&r1=639478&r2=639479&view=diff
> >> >> ==============================================================================
> >> >> --- geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml (original)
> >> >> +++ geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml Thu Mar 20 15:04:49 2008
> >> >> @@ -20,9 +20,9 @@
> >> >>
> >> >> <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
> >> >>
> >> >> -<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
> >> >> +<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
> >> >>
> >> >> - <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
> >> >> + <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>
> >> >>
> >> >> Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
> >> >> URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=639479&r1=639478&r2=639479&view=diff
> >> >> ==============================================================================
> >> >> --- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
> >> >> +++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml Thu Mar 20 15:04:49 2008
> >> >> @@ -18,7 +18,7 @@
> >> >> under the License.
> >> >> -->
> >> >> <web-app
> >> >> - xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
> >> >> + xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
> >> >>
> >> >> <environment>
> >> >> <moduleId>
> >> >>
> >> >>
> >> >>
> >> >
> >>
> >
>
Re: svn commit: r639479 - in /geronimo/samples/branches/2.1/samples/inventory:
inventory-ear/src/main/resources/META-INF/geronimo-application.xml inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
Posted by Hernan Cunico <hc...@gmail.com>.
hmmm, is this only needed on trunk? I mean we don't have these on on the branch
Cheers!
Hernan
Jarek Gawor wrote:
> Cool, thanks.
>
> The *-jetty and *-tomcat modules are the plugins for the given sample.
> As far as I know there is no easy way to have one module and have it
> generate two plugins or a single plugin that works with both
> distributions.
>
> Jarek
>
> On Mon, Mar 24, 2008 at 9:48 AM, Hernan Cunico <hc...@gmail.com> wrote:
>> My bad, meant to do that but got distracted, I'm updating trunk now.
>>
>> quick question though, why do we have a Jetty and a Tomcat version of the same app on trunk?
>>
>> Cheers!
>> Hernan
>>
>>
>>
>> Jarek Gawor wrote:
>> > Hernan,
>> >
>> > In case I missed it, can you also merge these changes to trunk?
>> >
>> > Thanks,
>> > Jarek
>> >
>> > On Thu, Mar 20, 2008 at 6:04 PM, <hc...@apache.org> wrote:
>> >> Author: hcunico
>> >> Date: Thu Mar 20 15:04:49 2008
>> >> New Revision: 639479
>> >>
>> >> URL: http://svn.apache.org/viewvc?rev=639479&view=rev
>> >> Log:
>> >> updated target name spaces in dep plans.
>> >>
>> >> Modified:
>> >> geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml
>> >> geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
>> >>
>> >> Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml
>> >> URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml?rev=639479&r1=639478&r2=639479&view=diff
>> >> ==============================================================================
>> >> --- geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml (original)
>> >> +++ geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml Thu Mar 20 15:04:49 2008
>> >> @@ -20,9 +20,9 @@
>> >>
>> >> <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
>> >>
>> >> -<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
>> >> +<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
>> >>
>> >> - <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
>> >> + <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>
>> >>
>> >> Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
>> >> URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=639479&r1=639478&r2=639479&view=diff
>> >> ==============================================================================
>> >> --- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
>> >> +++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml Thu Mar 20 15:04:49 2008
>> >> @@ -18,7 +18,7 @@
>> >> under the License.
>> >> -->
>> >> <web-app
>> >> - xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
>> >> + xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
>> >>
>> >> <environment>
>> >> <moduleId>
>> >>
>> >>
>> >>
>> >
>>
>
Re: svn commit: r639479 - in /geronimo/samples/branches/2.1/samples/inventory: inventory-ear/src/main/resources/META-INF/geronimo-application.xml inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
Posted by Jarek Gawor <jg...@gmail.com>.
Cool, thanks.
The *-jetty and *-tomcat modules are the plugins for the given sample.
As far as I know there is no easy way to have one module and have it
generate two plugins or a single plugin that works with both
distributions.
Jarek
On Mon, Mar 24, 2008 at 9:48 AM, Hernan Cunico <hc...@gmail.com> wrote:
> My bad, meant to do that but got distracted, I'm updating trunk now.
>
> quick question though, why do we have a Jetty and a Tomcat version of the same app on trunk?
>
> Cheers!
> Hernan
>
>
>
> Jarek Gawor wrote:
> > Hernan,
> >
> > In case I missed it, can you also merge these changes to trunk?
> >
> > Thanks,
> > Jarek
> >
> > On Thu, Mar 20, 2008 at 6:04 PM, <hc...@apache.org> wrote:
> >> Author: hcunico
> >> Date: Thu Mar 20 15:04:49 2008
> >> New Revision: 639479
> >>
> >> URL: http://svn.apache.org/viewvc?rev=639479&view=rev
> >> Log:
> >> updated target name spaces in dep plans.
> >>
> >> Modified:
> >> geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml
> >> geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
> >>
> >> Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml
> >> URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml?rev=639479&r1=639478&r2=639479&view=diff
> >> ==============================================================================
> >> --- geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml (original)
> >> +++ geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml Thu Mar 20 15:04:49 2008
> >> @@ -20,9 +20,9 @@
> >>
> >> <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
> >>
> >> -<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
> >> +<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
> >>
> >> - <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
> >> + <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>
> >>
> >> Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
> >> URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=639479&r1=639478&r2=639479&view=diff
> >> ==============================================================================
> >> --- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
> >> +++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml Thu Mar 20 15:04:49 2008
> >> @@ -18,7 +18,7 @@
> >> under the License.
> >> -->
> >> <web-app
> >> - xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
> >> + xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
> >>
> >> <environment>
> >> <moduleId>
> >>
> >>
> >>
> >
>
Re: svn commit: r639479 - in /geronimo/samples/branches/2.1/samples/inventory:
inventory-ear/src/main/resources/META-INF/geronimo-application.xml inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
Posted by Hernan Cunico <hc...@gmail.com>.
My bad, meant to do that but got distracted, I'm updating trunk now.
quick question though, why do we have a Jetty and a Tomcat version of the same app on trunk?
Cheers!
Hernan
Jarek Gawor wrote:
> Hernan,
>
> In case I missed it, can you also merge these changes to trunk?
>
> Thanks,
> Jarek
>
> On Thu, Mar 20, 2008 at 6:04 PM, <hc...@apache.org> wrote:
>> Author: hcunico
>> Date: Thu Mar 20 15:04:49 2008
>> New Revision: 639479
>>
>> URL: http://svn.apache.org/viewvc?rev=639479&view=rev
>> Log:
>> updated target name spaces in dep plans.
>>
>> Modified:
>> geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml
>> geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
>>
>> Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml
>> URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml?rev=639479&r1=639478&r2=639479&view=diff
>> ==============================================================================
>> --- geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml (original)
>> +++ geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml Thu Mar 20 15:04:49 2008
>> @@ -20,9 +20,9 @@
>>
>> <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
>>
>> -<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
>> +<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
>>
>> - <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
>> + <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>
>>
>> Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
>> URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=639479&r1=639478&r2=639479&view=diff
>> ==============================================================================
>> --- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
>> +++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml Thu Mar 20 15:04:49 2008
>> @@ -18,7 +18,7 @@
>> under the License.
>> -->
>> <web-app
>> - xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
>> + xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
>>
>> <environment>
>> <moduleId>
>>
>>
>>
>
Re: svn commit: r639479 - in /geronimo/samples/branches/2.1/samples/inventory: inventory-ear/src/main/resources/META-INF/geronimo-application.xml inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
Posted by Jarek Gawor <jg...@gmail.com>.
Hernan,
In case I missed it, can you also merge these changes to trunk?
Thanks,
Jarek
On Thu, Mar 20, 2008 at 6:04 PM, <hc...@apache.org> wrote:
> Author: hcunico
> Date: Thu Mar 20 15:04:49 2008
> New Revision: 639479
>
> URL: http://svn.apache.org/viewvc?rev=639479&view=rev
> Log:
> updated target name spaces in dep plans.
>
> Modified:
> geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml
> geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
>
> Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml?rev=639479&r1=639478&r2=639479&view=diff
> ==============================================================================
> --- geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml (original)
> +++ geronimo/samples/branches/2.1/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml Thu Mar 20 15:04:49 2008
> @@ -20,9 +20,9 @@
>
> <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
>
> -<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
> +<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
>
> - <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
> + <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>
>
> Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=639479&r1=639478&r2=639479&view=diff
> ==============================================================================
> --- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
> +++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml Thu Mar 20 15:04:49 2008
> @@ -18,7 +18,7 @@
> under the License.
> -->
> <web-app
> - xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
> + xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
>
> <environment>
> <moduleId>
>
>
>