Return-Path: 
 <scm-return-11510-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 6531 invoked from network); 23 Apr 2006 15:03:21 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 23 Apr 2006 15:03:21 -0000
Received: (qmail 72639 invoked by uid 500); 23 Apr 2006 15:03:21 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 72612 invoked by uid 500); 23 Apr 2006 15:03:21 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 72601 invoked by uid 99); 23 Apr 2006 15:03:20 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Apr 2006 08:03:20 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Sun, 23 Apr 2006 08:03:20 -0700
Received: (qmail 6464 invoked by uid 65534); 23 Apr 2006 15:02:59 -0000
Message-ID: <20060423150259.6463.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r396282 - in
 /geronimo/devtools/eclipse-plugin/trunk/plugins:
 org.apache.geronimo.runtime.common/ org.apache.geronimo.runtime.v1/
 org.apache.geronimo.runtime.v11/
 org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/
 org.apac...
Date: Sun, 23 Apr 2006 15:02:58 -0000
To: scm@geronimo.apache.org
From: sppatel@apache.org
X-Mailer: svnmailer-1.0.8
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: sppatel
Date: Sun Apr 23 08:02:57 2006
New Revision: 396282

URL: http://svn.apache.org/viewcvs?rev=396282&view=rev
Log:
more dependency fixes

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml?rev=396282&r1=396281&r2=396282&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml Sun Apr 23 08:02:57 2006
@@ -9,6 +9,10 @@
         <artifactId>geronimo-eclipse-plugin</artifactId>
         <version>1.0</version>
     </parent>
+    <properties>
+        <mx4jVersion>3.0.1</mx4jVersion>
+        <commonsLoggingVersion>1.0.4</commonsLoggingVersion>
+    </properties>
     <build>
         <resources>
             <resource>
@@ -43,6 +47,16 @@
                                     <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
                                     <version>${geronimo_spec_version}</version>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>mx4j</groupId>
+                                    <artifactId>mx4j-remote</artifactId>
+                                    <version>${mx4jVersion}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>mx4j</groupId>
+                                    <artifactId>mx4j</artifactId>
+                                    <version>${mx4jVersion}</version>
+                                </artifactItem>
                             </artifactItems>
                             <outputDirectory>lib</outputDirectory>
                         </configuration>
@@ -87,4 +101,16 @@
             </plugin>
         </plugins>
     </build>
+    <dependencies>
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j-remote</artifactId>
+            <version>${mx4jVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j</artifactId>
+            <version>${mx4jVersion}</version>
+        </dependency>
+    </dependencies>
 </project>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml?rev=396282&r1=396281&r2=396282&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml Sun Apr 23 08:02:57 2006
@@ -11,7 +11,6 @@
     </parent>
     <properties>
         <geronimoVersion>1.0</geronimoVersion>
-        <mx4jVersion>3.0.1</mx4jVersion>
         <commonsLoggingVersion>1.0.4</commonsLoggingVersion>
         <cglibVersion>2.1_3</cglibVersion>
         <xbeanVersion>2.0.0</xbeanVersion>
@@ -62,16 +61,6 @@
                                     <artifactId>
                                         geronimo-deploy-jsr88</artifactId>
                                     <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>mx4j</groupId>
-                                    <artifactId>mx4j-remote</artifactId>
-                                    <version>${mx4jVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>mx4j</groupId>
-                                    <artifactId>mx4j</artifactId>
-                                    <version>${mx4jVersion}</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>commons-logging</groupId>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml?rev=396282&r1=396281&r2=396282&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml Sun Apr 23 08:02:57 2006
@@ -11,7 +11,6 @@
     </parent>
     <properties>
         <geronimoVersion>1.1-SNAPSHOT</geronimoVersion>
-        <mx4jVersion>3.0.1</mx4jVersion>
         <commonsLoggingVersion>1.0.4</commonsLoggingVersion>
         <cglibVersion>2.1_3</cglibVersion>
         <xbeanVersion>2.0.0</xbeanVersion>
@@ -62,16 +61,6 @@
                                     <artifactId>
                                         geronimo-deploy-jsr88</artifactId>
                                     <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>mx4j</groupId>
-                                    <artifactId>mx4j-remote</artifactId>
-                                    <version>${mx4jVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>mx4j</groupId>
-                                    <artifactId>mx4j</artifactId>
-                                    <version>${mx4jVersion}</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>commons-logging</groupId>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java?rev=396282&r1=396281&r2=396282&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java Sun Apr 23 08:02:57 2006
@@ -46,7 +46,6 @@
 import org.apache.geronimo.st.core.commands.DeploymentCommandFactory;
 import org.apache.geronimo.st.core.commands.IDeploymentCommand;
 import org.apache.geronimo.st.core.commands.TargetModuleIdNotFoundException;
-import org.apache.geronimo.st.v11.core.internal.EclipseAwareConfigurationStore;
 import org.apache.geronimo.st.v11.core.internal.Messages;
 import org.apache.geronimo.st.v11.core.internal.Trace;
 import org.apache.geronimo.system.jmx.KernelDelegate;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml?rev=396282&r1=396281&r2=396282&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml Sun Apr 23 08:02:57 2006
@@ -175,7 +175,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.deployment.model</artifactId>
+            <artifactId>org.apache.geronimo.v11.deployment.model</artifactId>
             <version>${org.apache.geronimo.v11.deployment.model_version}</version>
         </dependency>
     </dependencies>