geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r536445 - in /geronimo/server/trunk/configs: client-system/pom.xml j2ee-system/pom.xml transformer-agent/pom.xml
Date Wed, 09 May 2007 07:08:08 GMT
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>



Mime
View raw message