You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ke...@apache.org on 2007/05/09 09:08:08 UTC
svn commit: r536445 - in /geronimo/server/trunk/configs:
client-system/pom.xml j2ee-system/pom.xml transformer-agent/pom.xml
Author: kevan
Date: Wed May 9 00:08:07 2007
New Revision: 536445
URL: http://svn.apache.org/viewvc?view=rev&rev=536445
Log:
GERONIMO-3141 Avoid a potential deadlock in ClassFileTransformer processing
Modified:
geronimo/server/trunk/configs/client-system/pom.xml
geronimo/server/trunk/configs/j2ee-system/pom.xml
geronimo/server/trunk/configs/transformer-agent/pom.xml
Modified: geronimo/server/trunk/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-system/pom.xml?view=diff&rev=536445&r1=536444&r2=536445
==============================================================================
--- geronimo/server/trunk/configs/client-system/pom.xml (original)
+++ geronimo/server/trunk/configs/client-system/pom.xml Wed May 9 00:08:07 2007
@@ -110,9 +110,12 @@
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
</element>
+ <!--
+ NOTE: geronimo-transformer is on the system classpath to avoid a potential deadlock. See GERONIMO-3141.
+ -->
<element>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-util</artifactId>
+ <artifactId>geronimo-transformer</artifactId>
<version>${version}</version>
</element>
<element>
Modified: geronimo/server/trunk/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-system/pom.xml?view=diff&rev=536445&r1=536444&r2=536445
==============================================================================
--- geronimo/server/trunk/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-system/pom.xml Wed May 9 00:08:07 2007
@@ -113,6 +113,14 @@
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
</element>
+ <!--
+ NOTE: geronimo-transformer needs to be on the system classpath to avoid a potential deadlock. See GERONIMO-3141.
+ -->
+ <element>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-transformer</artifactId>
+ <version>${version}</version>
+ </element>
<element>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
Modified: geronimo/server/trunk/configs/transformer-agent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/transformer-agent/pom.xml?view=diff&rev=536445&r1=536444&r2=536445
==============================================================================
--- geronimo/server/trunk/configs/transformer-agent/pom.xml (original)
+++ geronimo/server/trunk/configs/transformer-agent/pom.xml Wed May 9 00:08:07 2007
@@ -45,18 +45,12 @@
<Extension-Dirs>lib/ext</Extension-Dirs>
<Premain-Class>org.apache.geronimo.transformer.TransformerAgent</Premain-Class>
</manifestEntries>
- <manifest>
- <mainClass>org.apache.geronimo.system.main.Daemon</mainClass>
- </manifest>
</archive>
<!--
NOTE: This list of dependencies is non-transitive.
-->
<classpath>
- <element>
- <entry>server.jar</entry>
- </element>
<element>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-transformer</artifactId>
Re: svn commit: r536445 - in /geronimo/server/trunk/configs: client-system/pom.xml j2ee-system/pom.xml transformer-agent/pom.xml
Posted by David Jencks <da...@yahoo.com>.
I suspect it was originally an overenthusiastic cut-and-paste
exercise on my part. AFAIK specifying a main class in an agent jar
has no effect, so that part of this patch is cruft cleanup.
thanks
david jencks
On May 9, 2007, at 6:15 AM, Anita Kulshreshtha wrote:
> Just curious....
> Why was the main class org.apache.geronimo.system.main.Daemon? we
> have not been using it for a while.
>
> Thanks
> Anita
>
> --- kevan@apache.org wrote:
>
>> Author: kevan
>> Date: Wed May 9 00:08:07 2007
>> New Revision: 536445
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=536445
>> Log:
>> GERONIMO-3141 Avoid a potential deadlock in ClassFileTransformer
>> processing
>>
>> Modified:
>> geronimo/server/trunk/configs/client-system/pom.xml
>> geronimo/server/trunk/configs/j2ee-system/pom.xml
>> geronimo/server/trunk/configs/transformer-agent/pom.xml
>>
>> Modified: geronimo/server/trunk/configs/client-system/pom.xml
>> URL:
>>
> http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-
> system/pom.xml?view=diff&rev=536445&r1=536444&r2=536445
>>
> ======================================================================
> ========
>> --- geronimo/server/trunk/configs/client-system/pom.xml (original)
>> +++ geronimo/server/trunk/configs/client-system/pom.xml Wed May 9
>> 00:08:07 2007
>> @@ -110,9 +110,12 @@
>> <artifactId>geronimo-kernel</artifactId>
>> <version>${version}</version>
>> </element>
>> + <!--
>> + NOTE: geronimo-transformer is on the system
>> classpath to avoid a potential deadlock. See GERONIMO-3141.
>> + -->
>> <element>
>>
>> <groupId>org.apache.geronimo.modules</groupId>
>> - <artifactId>geronimo-util</artifactId>
>> +
>> <artifactId>geronimo-transformer</artifactId>
>> <version>${version}</version>
>> </element>
>> <element>
>>
>> Modified: geronimo/server/trunk/configs/j2ee-system/pom.xml
>> URL:
>>
> http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-
> system/pom.xml?view=diff&rev=536445&r1=536444&r2=536445
>>
> ======================================================================
> ========
>> --- geronimo/server/trunk/configs/j2ee-system/pom.xml (original)
>> +++ geronimo/server/trunk/configs/j2ee-system/pom.xml Wed May 9
>> 00:08:07 2007
>> @@ -113,6 +113,14 @@
>> <artifactId>geronimo-kernel</artifactId>
>> <version>${version}</version>
>> </element>
>> + <!--
>> + NOTE: geronimo-transformer needs to be on
>> the system classpath to avoid a potential deadlock. See
>> GERONIMO-3141.
>> + -->
>> + <element>
>> +
>> <groupId>org.apache.geronimo.modules</groupId>
>> +
>> <artifactId>geronimo-transformer</artifactId>
>> + <version>${version}</version>
>> + </element>
>> <element>
>> <groupId>commons-cli</groupId>
>> <artifactId>commons-cli</artifactId>
>>
>> Modified: geronimo/server/trunk/configs/transformer-agent/pom.xml
>> URL:
>>
> http://svn.apache.org/viewvc/geronimo/server/trunk/configs/
> transformer-agent/pom.xml?view=diff&rev=536445&r1=536444&r2=536445
>>
> ======================================================================
> ========
>> --- geronimo/server/trunk/configs/transformer-agent/pom.xml
>> (original)
>> +++ geronimo/server/trunk/configs/transformer-agent/pom.xml Wed May
>> 9 00:08:07 2007
>> @@ -45,18 +45,12 @@
>> <Extension-Dirs>lib/ext</Extension-Dirs>
>>
>>
> <Premain-Class>org.apache.geronimo.transformer.TransformerAgent</
> Premain-Class>
>> </manifestEntries>
>> - <manifest>
>> -
>> <mainClass>org.apache.geronimo.system.main.Daemon</mainClass>
>> - </manifest>
>> </archive>
>>
>> <!--
>> NOTE: This list of dependencies is
>> non-transitive.
>> -->
>> <classpath>
>> - <element>
>> - <entry>server.jar</entry>
>> - </element>
>> <element>
>>
>> <groupId>org.apache.geronimo.modules</groupId>
>>
>> <artifactId>geronimo-transformer</artifactId>
>>
>>
>>
>
>
> __________________________________________________
> Do You Yahoo!?
> Tired of spam? Yahoo! Mail has the best spam protection around
> http://mail.yahoo.com
Re: svn commit: r536445 - in /geronimo/server/trunk/configs: client-system/pom.xml j2ee-system/pom.xml transformer-agent/pom.xml
Posted by Kevan Miller <ke...@gmail.com>.
On May 9, 2007, at 9:15 AM, Anita Kulshreshtha wrote:
> Just curious....
> Why was the main class org.apache.geronimo.system.main.Daemon? we
> have not been using it for a while.
Heh. Good question. I'm pretty sure that it was a copy/paste error.
To my knowledge, we've never used jpa.jar as an executable jar and
the main class was dated (as you've noted). I felt pretty comfortable
removing it (assuming it built... ;-)
I also removed geronimo-util from the manifest in client.jar. The
classpath for client.jar and server.jar are now identical... All
testing looked good to me. Let me know if anyone sees a problem...
--kevan
<snip>
>>
> http://svn.apache.org/viewvc/geronimo/server/trunk/configs/
> transformer-agent/pom.xml?view=diff&rev=536445&r1=536444&r2=536445
>>
> ======================================================================
> ========
>> --- geronimo/server/trunk/configs/transformer-agent/pom.xml
>> (original)
>> +++ geronimo/server/trunk/configs/transformer-agent/pom.xml Wed May
>> 9 00:08:07 2007
>> @@ -45,18 +45,12 @@
>> <Extension-Dirs>lib/ext</Extension-Dirs>
>>
>>
> <Premain-Class>org.apache.geronimo.transformer.TransformerAgent</
> Premain-Class>
>> </manifestEntries>
>> - <manifest>
>> -
>> <mainClass>org.apache.geronimo.system.main.Daemon</mainClass>
>> - </manifest>
>> </archive>
>>
>> <!--
>> NOTE: This list of dependencies is
>> non-transitive.
>> -->
>> <classpath>
>> - <element>
>> - <entry>server.jar</entry>
>> - </element>
>> <element>
>>
>> <groupId>org.apache.geronimo.modules</groupId>
>>
>> <artifactId>geronimo-transformer</artifactId>
>>
>>
>>
>
>
> __________________________________________________
> Do You Yahoo!?
> Tired of spam? Yahoo! Mail has the best spam protection around
> http://mail.yahoo.com
Re: svn commit: r536445 - in /geronimo/server/trunk/configs: client-system/pom.xml j2ee-system/pom.xml transformer-agent/pom.xml
Posted by Anita Kulshreshtha <a_...@yahoo.com>.
Just curious....
Why was the main class org.apache.geronimo.system.main.Daemon? we
have not been using it for a while.
Thanks
Anita
--- kevan@apache.org wrote:
> Author: kevan
> Date: Wed May 9 00:08:07 2007
> New Revision: 536445
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=536445
> Log:
> GERONIMO-3141 Avoid a potential deadlock in ClassFileTransformer
> processing
>
> Modified:
> geronimo/server/trunk/configs/client-system/pom.xml
> geronimo/server/trunk/configs/j2ee-system/pom.xml
> geronimo/server/trunk/configs/transformer-agent/pom.xml
>
> Modified: geronimo/server/trunk/configs/client-system/pom.xml
> URL:
>
http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-system/pom.xml?view=diff&rev=536445&r1=536444&r2=536445
>
==============================================================================
> --- geronimo/server/trunk/configs/client-system/pom.xml (original)
> +++ geronimo/server/trunk/configs/client-system/pom.xml Wed May 9
> 00:08:07 2007
> @@ -110,9 +110,12 @@
> <artifactId>geronimo-kernel</artifactId>
> <version>${version}</version>
> </element>
> + <!--
> + NOTE: geronimo-transformer is on the system
> classpath to avoid a potential deadlock. See GERONIMO-3141.
> + -->
> <element>
>
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-util</artifactId>
> +
> <artifactId>geronimo-transformer</artifactId>
> <version>${version}</version>
> </element>
> <element>
>
> Modified: geronimo/server/trunk/configs/j2ee-system/pom.xml
> URL:
>
http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-system/pom.xml?view=diff&rev=536445&r1=536444&r2=536445
>
==============================================================================
> --- geronimo/server/trunk/configs/j2ee-system/pom.xml (original)
> +++ geronimo/server/trunk/configs/j2ee-system/pom.xml Wed May 9
> 00:08:07 2007
> @@ -113,6 +113,14 @@
> <artifactId>geronimo-kernel</artifactId>
> <version>${version}</version>
> </element>
> + <!--
> + NOTE: geronimo-transformer needs to be on
> the system classpath to avoid a potential deadlock. See
> GERONIMO-3141.
> + -->
> + <element>
> +
> <groupId>org.apache.geronimo.modules</groupId>
> +
> <artifactId>geronimo-transformer</artifactId>
> + <version>${version}</version>
> + </element>
> <element>
> <groupId>commons-cli</groupId>
> <artifactId>commons-cli</artifactId>
>
> Modified: geronimo/server/trunk/configs/transformer-agent/pom.xml
> URL:
>
http://svn.apache.org/viewvc/geronimo/server/trunk/configs/transformer-agent/pom.xml?view=diff&rev=536445&r1=536444&r2=536445
>
==============================================================================
> --- geronimo/server/trunk/configs/transformer-agent/pom.xml
> (original)
> +++ geronimo/server/trunk/configs/transformer-agent/pom.xml Wed May
> 9 00:08:07 2007
> @@ -45,18 +45,12 @@
> <Extension-Dirs>lib/ext</Extension-Dirs>
>
>
<Premain-Class>org.apache.geronimo.transformer.TransformerAgent</Premain-Class>
> </manifestEntries>
> - <manifest>
> -
> <mainClass>org.apache.geronimo.system.main.Daemon</mainClass>
> - </manifest>
> </archive>
>
> <!--
> NOTE: This list of dependencies is
> non-transitive.
> -->
> <classpath>
> - <element>
> - <entry>server.jar</entry>
> - </element>
> <element>
>
> <groupId>org.apache.geronimo.modules</groupId>
>
> <artifactId>geronimo-transformer</artifactId>
>
>
>
__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around
http://mail.yahoo.com