You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/04/23 17:02:58 UTC
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...
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>