You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by va...@apache.org on 2007/10/24 22:58:32 UTC
svn commit: r588019 - in /geronimo/server: branches/2.0/configs/sharedlib/
branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/sharedlib/
trunk/configs/sharedlib/
trunk/modules/geronimo-system/src/main/java/org/apache/geronimo...
Author: vamsic007
Date: Wed Oct 24 13:58:32 2007
New Revision: 588019
URL: http://svn.apache.org/viewvc?rev=588019&view=rev
Log:
GERONIMO-3546 sharedlib config should not start rmi-naming when used with offline deployer
o Thanks to David Jencks for suggesting a better solution than the one I had cooked originally.
o Reverse rev 587515 and 587806
o Change the dependency scope of rmi-naming to runtime i.e. <import>classes</import>
o Make SharedLib use SingleElementCollection for ServerInfo
Modified:
geronimo/server/branches/2.0/configs/sharedlib/pom.xml
geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/sharedlib/SharedLib.java
geronimo/server/trunk/configs/sharedlib/pom.xml
geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/sharedlib/SharedLib.java
Modified: geronimo/server/branches/2.0/configs/sharedlib/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/configs/sharedlib/pom.xml?rev=588019&r1=588018&r2=588019&view=diff
==============================================================================
--- geronimo/server/branches/2.0/configs/sharedlib/pom.xml (original)
+++ geronimo/server/branches/2.0/configs/sharedlib/pom.xml Wed Oct 24 13:58:32 2007
@@ -37,19 +37,12 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-system</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
-
- <!-- Needed for offline deployer -->
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>rmi-naming</artifactId>
<version>${version}</version>
<type>car</type>
<scope>runtime</scope>
</dependency>
+
</dependencies>
</project>
Modified: geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/sharedlib/SharedLib.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/sharedlib/SharedLib.java?rev=588019&r1=588018&r2=588019&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/sharedlib/SharedLib.java (original)
+++ geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/sharedlib/SharedLib.java Wed Oct 24 13:58:32 2007
@@ -18,7 +18,10 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.SingleElementCollection;
+
import java.util.Arrays;
+import java.util.Collection;
import java.util.Set;
import java.util.HashSet;
import java.util.LinkedHashSet;
@@ -34,7 +37,11 @@
* @version $Rev$ $Date$
*/
public class SharedLib {
- public SharedLib(ClassLoader classLoader, String[] classesDirs, String[] libDirs, ServerInfo serverInfo) throws MalformedURLException {
+ public SharedLib(ClassLoader classLoader, String[] classesDirs, String[] libDirs, Collection<ServerInfo> serverInfos) throws MalformedURLException {
+ this(classLoader, classesDirs, libDirs, new SingleElementCollection<ServerInfo>(serverInfos).getElement());
+ }
+
+ private SharedLib(ClassLoader classLoader, String[] classesDirs, String[] libDirs, ServerInfo serverInfo) throws MalformedURLException {
MultiParentClassLoader multiParentClassLoader = (MultiParentClassLoader) classLoader;
Set currentUrls = new HashSet(Arrays.asList(multiParentClassLoader.getURLs()));
Modified: geronimo/server/trunk/configs/sharedlib/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/sharedlib/pom.xml?rev=588019&r1=588018&r2=588019&view=diff
==============================================================================
--- geronimo/server/trunk/configs/sharedlib/pom.xml (original)
+++ geronimo/server/trunk/configs/sharedlib/pom.xml Wed Oct 24 13:58:32 2007
@@ -36,14 +36,6 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-system</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
-
- <!-- Needed for offline deployer -->
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>rmi-naming</artifactId>
<version>${version}</version>
<type>car</type>
Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/sharedlib/SharedLib.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/sharedlib/SharedLib.java?rev=588019&r1=588018&r2=588019&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/sharedlib/SharedLib.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/sharedlib/SharedLib.java Wed Oct 24 13:58:32 2007
@@ -18,7 +18,10 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.SingleElementCollection;
+
import java.util.Arrays;
+import java.util.Collection;
import java.util.Set;
import java.util.HashSet;
import java.util.LinkedHashSet;
@@ -34,7 +37,11 @@
* @version $Rev$ $Date$
*/
public class SharedLib {
- public SharedLib(ClassLoader classLoader, String[] classesDirs, String[] libDirs, ServerInfo serverInfo) throws MalformedURLException {
+ public SharedLib(ClassLoader classLoader, String[] classesDirs, String[] libDirs, Collection<ServerInfo> serverInfos) throws MalformedURLException {
+ this(classLoader, classesDirs, libDirs, new SingleElementCollection<ServerInfo>(serverInfos).getElement());
+ }
+
+ private SharedLib(ClassLoader classLoader, String[] classesDirs, String[] libDirs, ServerInfo serverInfo) throws MalformedURLException {
MultiParentClassLoader multiParentClassLoader = (MultiParentClassLoader) classLoader;
Set currentUrls = new HashSet(Arrays.asList(multiParentClassLoader.getURLs()));