You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2006/07/25 17:55:36 UTC
svn commit: r425429 -
/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
Author: ammulder
Date: Tue Jul 25 08:55:34 2006
New Revision: 425429
URL: http://svn.apache.org/viewvc?rev=425429&view=rev
Log:
Module and name are independent of artifact
Modified:
geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java?rev=425429&r1=425428&r2=425429&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java (original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java Tue Jul 25 08:55:34 2006
@@ -459,17 +459,17 @@
type.appendChild(doc.createTextNode(artifact.getType()));
pat.appendChild(type);
}
- Map nameMap = pattern.getName();
- if (nameMap.get("module") != null) {
- Element module = doc.createElement("module");
- module.appendChild(doc.createTextNode(nameMap.get("module").toString()));
- pat.appendChild(module);
- }
- if (nameMap.get("name") != null) {
- Element patName = doc.createElement("name");
- patName.appendChild(doc.createTextNode(nameMap.get("name").toString()));
- pat.appendChild(patName);
- }
+ }
+ Map nameMap = pattern.getName();
+ if (nameMap.get("module") != null) {
+ Element module = doc.createElement("module");
+ module.appendChild(doc.createTextNode(nameMap.get("module").toString()));
+ pat.appendChild(module);
+ }
+ if (nameMap.get("name") != null) {
+ Element patName = doc.createElement("name");
+ patName.appendChild(doc.createTextNode(nameMap.get("name").toString()));
+ pat.appendChild(patName);
}
// out.print(pattern.toString());
}
Re: Attn: Aaron - Re: svn commit: r425429 - /geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
Posted by Aaron Mulder <am...@alumni.princeton.edu>.
I have no idea, but it causes an exception; it's definitely a bug.
Thanks,
Aaron
On 7/27/06, John Sisson <jr...@gmail.com> wrote:
> Altered the subject, hopefully won't go unnoticed this time :-)
> John
>
> John Sisson wrote:
> > Reposting.. probably got lost in all the email traffic.
> >
> > John
> >
> > John Sisson wrote:
> >> Aaron,
> >>
> >> What JIRA is associated with this change?
> >>
> >> Thanks,
> >> John
> >>
> >> ammulder@apache.org wrote:
> >>> Author: ammulder
> >>> Date: Tue Jul 25 08:55:34 2006
> >>> New Revision: 425429
> >>>
> >>> URL: http://svn.apache.org/viewvc?rev=425429&view=rev
> >>> Log:
> >>> Module and name are independent of artifact
> >>>
> >>> Modified:
> >>>
> >>> geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
> >>>
> >>>
> >>> Modified:
> >>> geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
> >>>
> >>> URL:
> >>> http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java?rev=425429&r1=425428&r2=425429&view=diff
> >>>
> >>> ==============================================================================
> >>>
> >>> ---
> >>> geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
> >>> (original)
> >>> +++
> >>> geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
> >>> Tue Jul 25 08:55:34 2006
> >>> @@ -459,17 +459,17 @@
> >>>
> >>> type.appendChild(doc.createTextNode(artifact.getType()));
> >>> pat.appendChild(type);
> >>> }
> >>> - Map nameMap = pattern.getName();
> >>> - if (nameMap.get("module") != null) {
> >>> - Element module = doc.createElement("module");
> >>> -
> >>> module.appendChild(doc.createTextNode(nameMap.get("module").toString()));
> >>>
> >>> - pat.appendChild(module);
> >>> - }
> >>> - if (nameMap.get("name") != null) {
> >>> - Element patName = doc.createElement("name");
> >>> -
> >>> patName.appendChild(doc.createTextNode(nameMap.get("name").toString()));
> >>>
> >>> - pat.appendChild(patName);
> >>> - }
> >>> + }
> >>> + Map nameMap = pattern.getName();
> >>> + if (nameMap.get("module") != null) {
> >>> + Element module = doc.createElement("module");
> >>> +
> >>> module.appendChild(doc.createTextNode(nameMap.get("module").toString()));
> >>>
> >>> + pat.appendChild(module);
> >>> + }
> >>> + if (nameMap.get("name") != null) {
> >>> + Element patName = doc.createElement("name");
> >>> +
> >>> patName.appendChild(doc.createTextNode(nameMap.get("name").toString()));
> >>>
> >>> + pat.appendChild(patName);
> >>> }
> >>> // out.print(pattern.toString());
> >>> }
> >>>
> >>>
> >>>
> >>>
> >>
> >>
> >
>
>
Re: Attn: Aaron - Re: svn commit: r425429 - /geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
Posted by Aaron Mulder <am...@alumni.princeton.edu>.
GERONIMO-2146
On 7/27/06, John Sisson <jr...@gmail.com> wrote:
> Altered the subject, hopefully won't go unnoticed this time :-)
> John
>
> John Sisson wrote:
> > Reposting.. probably got lost in all the email traffic.
> >
> > John
> >
> > John Sisson wrote:
> >> Aaron,
> >>
> >> What JIRA is associated with this change?
> >>
> >> Thanks,
> >> John
> >>
> >> ammulder@apache.org wrote:
> >>> Author: ammulder
> >>> Date: Tue Jul 25 08:55:34 2006
> >>> New Revision: 425429
> >>>
> >>> URL: http://svn.apache.org/viewvc?rev=425429&view=rev
> >>> Log:
> >>> Module and name are independent of artifact
> >>>
> >>> Modified:
> >>>
> >>> geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
> >>>
> >>>
> >>> Modified:
> >>> geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
> >>>
> >>> URL:
> >>> http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java?rev=425429&r1=425428&r2=425429&view=diff
> >>>
> >>> ==============================================================================
> >>>
> >>> ---
> >>> geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
> >>> (original)
> >>> +++
> >>> geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
> >>> Tue Jul 25 08:55:34 2006
> >>> @@ -459,17 +459,17 @@
> >>>
> >>> type.appendChild(doc.createTextNode(artifact.getType()));
> >>> pat.appendChild(type);
> >>> }
> >>> - Map nameMap = pattern.getName();
> >>> - if (nameMap.get("module") != null) {
> >>> - Element module = doc.createElement("module");
> >>> -
> >>> module.appendChild(doc.createTextNode(nameMap.get("module").toString()));
> >>>
> >>> - pat.appendChild(module);
> >>> - }
> >>> - if (nameMap.get("name") != null) {
> >>> - Element patName = doc.createElement("name");
> >>> -
> >>> patName.appendChild(doc.createTextNode(nameMap.get("name").toString()));
> >>>
> >>> - pat.appendChild(patName);
> >>> - }
> >>> + }
> >>> + Map nameMap = pattern.getName();
> >>> + if (nameMap.get("module") != null) {
> >>> + Element module = doc.createElement("module");
> >>> +
> >>> module.appendChild(doc.createTextNode(nameMap.get("module").toString()));
> >>>
> >>> + pat.appendChild(module);
> >>> + }
> >>> + if (nameMap.get("name") != null) {
> >>> + Element patName = doc.createElement("name");
> >>> +
> >>> patName.appendChild(doc.createTextNode(nameMap.get("name").toString()));
> >>>
> >>> + pat.appendChild(patName);
> >>> }
> >>> // out.print(pattern.toString());
> >>> }
> >>>
> >>>
> >>>
> >>>
> >>
> >>
> >
>
>
Attn: Aaron - Re: svn commit: r425429 - /geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
Posted by John Sisson <jr...@gmail.com>.
Altered the subject, hopefully won't go unnoticed this time :-)
John
John Sisson wrote:
> Reposting.. probably got lost in all the email traffic.
>
> John
>
> John Sisson wrote:
>> Aaron,
>>
>> What JIRA is associated with this change?
>>
>> Thanks,
>> John
>>
>> ammulder@apache.org wrote:
>>> Author: ammulder
>>> Date: Tue Jul 25 08:55:34 2006
>>> New Revision: 425429
>>>
>>> URL: http://svn.apache.org/viewvc?rev=425429&view=rev
>>> Log:
>>> Module and name are independent of artifact
>>>
>>> Modified:
>>>
>>> geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
>>>
>>>
>>> Modified:
>>> geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
>>>
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java?rev=425429&r1=425428&r2=425429&view=diff
>>>
>>> ==============================================================================
>>>
>>> ---
>>> geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
>>> (original)
>>> +++
>>> geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
>>> Tue Jul 25 08:55:34 2006
>>> @@ -459,17 +459,17 @@
>>>
>>> type.appendChild(doc.createTextNode(artifact.getType()));
>>> pat.appendChild(type);
>>> }
>>> - Map nameMap = pattern.getName();
>>> - if (nameMap.get("module") != null) {
>>> - Element module = doc.createElement("module");
>>> -
>>> module.appendChild(doc.createTextNode(nameMap.get("module").toString()));
>>>
>>> - pat.appendChild(module);
>>> - }
>>> - if (nameMap.get("name") != null) {
>>> - Element patName = doc.createElement("name");
>>> -
>>> patName.appendChild(doc.createTextNode(nameMap.get("name").toString()));
>>>
>>> - pat.appendChild(patName);
>>> - }
>>> + }
>>> + Map nameMap = pattern.getName();
>>> + if (nameMap.get("module") != null) {
>>> + Element module = doc.createElement("module");
>>> +
>>> module.appendChild(doc.createTextNode(nameMap.get("module").toString()));
>>>
>>> + pat.appendChild(module);
>>> + }
>>> + if (nameMap.get("name") != null) {
>>> + Element patName = doc.createElement("name");
>>> +
>>> patName.appendChild(doc.createTextNode(nameMap.get("name").toString()));
>>>
>>> + pat.appendChild(patName);
>>> }
>>> // out.print(pattern.toString());
>>> }
>>>
>>>
>>>
>>>
>>
>>
>
Re: svn commit: r425429 - /geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
Posted by John Sisson <js...@internode.on.net>.
Reposting.. probably got lost in all the email traffic.
John
John Sisson wrote:
> Aaron,
>
> What JIRA is associated with this change?
>
> Thanks,
> John
>
> ammulder@apache.org wrote:
>> Author: ammulder
>> Date: Tue Jul 25 08:55:34 2006
>> New Revision: 425429
>>
>> URL: http://svn.apache.org/viewvc?rev=425429&view=rev
>> Log:
>> Module and name are independent of artifact
>>
>> Modified:
>>
>> geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
>>
>>
>> Modified:
>> geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
>>
>> URL:
>> http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java?rev=425429&r1=425428&r2=425429&view=diff
>>
>> ==============================================================================
>>
>> ---
>> geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
>> (original)
>> +++
>> geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
>> Tue Jul 25 08:55:34 2006
>> @@ -459,17 +459,17 @@
>>
>> type.appendChild(doc.createTextNode(artifact.getType()));
>> pat.appendChild(type);
>> }
>> - Map nameMap = pattern.getName();
>> - if (nameMap.get("module") != null) {
>> - Element module = doc.createElement("module");
>> -
>> module.appendChild(doc.createTextNode(nameMap.get("module").toString()));
>> - pat.appendChild(module);
>> - }
>> - if (nameMap.get("name") != null) {
>> - Element patName = doc.createElement("name");
>> -
>> patName.appendChild(doc.createTextNode(nameMap.get("name").toString()));
>> - pat.appendChild(patName);
>> - }
>> + }
>> + Map nameMap = pattern.getName();
>> + if (nameMap.get("module") != null) {
>> + Element module = doc.createElement("module");
>> +
>> module.appendChild(doc.createTextNode(nameMap.get("module").toString()));
>> + pat.appendChild(module);
>> + }
>> + if (nameMap.get("name") != null) {
>> + Element patName = doc.createElement("name");
>> +
>> patName.appendChild(doc.createTextNode(nameMap.get("name").toString()));
>> + pat.appendChild(patName);
>> }
>> // out.print(pattern.toString());
>> }
>>
>>
>>
>>
>
>
Re: svn commit: r425429 - /geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
Posted by John Sisson <jr...@gmail.com>.
Aaron,
What JIRA is associated with this change?
Thanks,
John
ammulder@apache.org wrote:
> Author: ammulder
> Date: Tue Jul 25 08:55:34 2006
> New Revision: 425429
>
> URL: http://svn.apache.org/viewvc?rev=425429&view=rev
> Log:
> Module and name are independent of artifact
>
> Modified:
> geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
>
> Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
> URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java?rev=425429&r1=425428&r2=425429&view=diff
> ==============================================================================
> --- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java (original)
> +++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java Tue Jul 25 08:55:34 2006
> @@ -459,17 +459,17 @@
> type.appendChild(doc.createTextNode(artifact.getType()));
> pat.appendChild(type);
> }
> - Map nameMap = pattern.getName();
> - if (nameMap.get("module") != null) {
> - Element module = doc.createElement("module");
> - module.appendChild(doc.createTextNode(nameMap.get("module").toString()));
> - pat.appendChild(module);
> - }
> - if (nameMap.get("name") != null) {
> - Element patName = doc.createElement("name");
> - patName.appendChild(doc.createTextNode(nameMap.get("name").toString()));
> - pat.appendChild(patName);
> - }
> + }
> + Map nameMap = pattern.getName();
> + if (nameMap.get("module") != null) {
> + Element module = doc.createElement("module");
> + module.appendChild(doc.createTextNode(nameMap.get("module").toString()));
> + pat.appendChild(module);
> + }
> + if (nameMap.get("name") != null) {
> + Element patName = doc.createElement("name");
> + patName.appendChild(doc.createTextNode(nameMap.get("name").toString()));
> + pat.appendChild(patName);
> }
> // out.print(pattern.toString());
> }
>
>
>
>
Re: svn commit: r425429 - /geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
Posted by Jason Dillon <ja...@planet57.com>.
Merge to trunk?
--jason
On Jul 25, 2006, at 8:55 AM, ammulder@apache.org wrote:
> Author: ammulder
> Date: Tue Jul 25 08:55:34 2006
> New Revision: 425429
>
> URL: http://svn.apache.org/viewvc?rev=425429&view=rev
> Log:
> Module and name are independent of artifact
>
> Modified:
> geronimo/branches/1.1/modules/system/src/java/org/apache/
> geronimo/system/configuration/GBeanOverride.java
>
> Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/
> geronimo/system/configuration/GBeanOverride.java
> URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/
> system/src/java/org/apache/geronimo/system/configuration/
> GBeanOverride.java?rev=425429&r1=425428&r2=425429&view=diff
> ======================================================================
> ========
> --- geronimo/branches/1.1/modules/system/src/java/org/apache/
> geronimo/system/configuration/GBeanOverride.java (original)
> +++ geronimo/branches/1.1/modules/system/src/java/org/apache/
> geronimo/system/configuration/GBeanOverride.java Tue Jul 25
> 08:55:34 2006
> @@ -459,17 +459,17 @@
> type.appendChild(doc.createTextNode
> (artifact.getType()));
> pat.appendChild(type);
> }
> - Map nameMap = pattern.getName();
> - if (nameMap.get("module") != null) {
> - Element module = doc.createElement("module");
> - module.appendChild(doc.createTextNode
> (nameMap.get("module").toString()));
> - pat.appendChild(module);
> - }
> - if (nameMap.get("name") != null) {
> - Element patName = doc.createElement("name");
> - patName.appendChild(doc.createTextNode
> (nameMap.get("name").toString()));
> - pat.appendChild(patName);
> - }
> + }
> + Map nameMap = pattern.getName();
> + if (nameMap.get("module") != null) {
> + Element module = doc.createElement("module");
> + module.appendChild(doc.createTextNode
> (nameMap.get("module").toString()));
> + pat.appendChild(module);
> + }
> + if (nameMap.get("name") != null) {
> + Element patName = doc.createElement("name");
> + patName.appendChild(doc.createTextNode
> (nameMap.get("name").toString()));
> + pat.appendChild(patName);
> }
> // out.print(pattern.toString());
> }
>
>