geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r825635 - in /geronimo/sandbox/djencks/osgi/framework: configs/karaf-framework/ modules/geronimo-kernel/ modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/ modules/geronimo-rmi-loader/ modules/geronimo-rmi-loader/src/ mod...
Date Thu, 15 Oct 2009 20:22:38 GMT
Author: gawor
Date: Thu Oct 15 20:22:38 2009
New Revision: 825635

URL: http://svn.apache.org/viewvc?rev=825635&view=rev
Log:
create a separate module for RMIClassLoaderSpiImpI as it must be loaded from system classloader

Added:
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-rmi-loader/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-rmi-loader/pom.xml   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-rmi-loader/src/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-rmi-loader/src/main/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-rmi-loader/src/main/java/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-rmi-loader/src/main/java/org/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java
  (props changed)
      - copied unchanged from r825625, geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java
Removed:
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java
Modified:
    geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java

Modified: geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/pom.xml?rev=825635&r1=825634&r2=825635&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/pom.xml Thu Oct 15 20:22:38
2009
@@ -95,7 +95,11 @@
                 <version>${felix.configadmin.version}</version>
             </dependency>
 
-            
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-rmi-loader</artifactId>
+                <version>${version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -440,6 +444,12 @@
                                     <outputDirectory>target/dependencies</outputDirectory>
                                     <destFileName>karaf-jaas-boot.jar</destFileName>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.framework</groupId>
+                                    <artifactId>geronimo-rmi-loader</artifactId>
+                                    <outputDirectory>target/dependencies</outputDirectory>
+                                    <destFileName>geronimo-rmi-loader.jar</destFileName>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/pom.xml?rev=825635&r1=825634&r2=825635&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/pom.xml Thu Oct 15 20:22:38
2009
@@ -34,6 +34,12 @@
     
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-rmi-loader</artifactId>
+            <version>${version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.osgi.core</artifactId>
         </dependency>

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java?rev=825635&r1=825634&r2=825635&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java
(original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java
Thu Oct 15 20:22:38 2009
@@ -63,7 +63,7 @@
     }
 
     public void doStart() throws Exception {
-//        System.setProperty("java.rmi.server.RMIClassLoaderSpi",RMIClassLoaderSpiImpl.class.getName());
+        System.setProperty("java.rmi.server.RMIClassLoaderSpi",RMIClassLoaderSpiImpl.class.getName());
         if (System.getProperty("java.rmi.server.hostname") == null && host != null
&& !host.equals("0.0.0.0")) {
             System.setProperty("java.rmi.server.hostname", host);
         }

Added: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-rmi-loader/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-rmi-loader/pom.xml?rev=825635&view=auto
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-rmi-loader/pom.xml (added)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-rmi-loader/pom.xml Thu Oct 15
20:22:38 2009
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+    
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>modules</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>geronimo-rmi-loader</artifactId>
+    <packaging>jar</packaging>
+    <name>Geronimo Framework, Modules :: RMI Loader</name>
+        
+</project>
+

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-rmi-loader/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-rmi-loader/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-rmi-loader/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 15 20:22:38 2009
@@ -0,0 +1 @@
+/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java:749113,749116-807432,809079-825588

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message