geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r216234 - in /geronimo/trunk: assemblies/j2ee-server/project.xml etc/project.properties modules/assembly/project.xml modules/system/src/java/org/apache/geronimo/system/main/Daemon.java
Date Wed, 13 Jul 2005 20:50:26 GMT
Author: dain
Date: Wed Jul 13 13:50:25 2005
New Revision: 216234

URL: http://svn.apache.org/viewcvs?rev=216234&view=rev
Log:
Removed openorb/tmporb
Removed tools jar hack

Modified:
    geronimo/trunk/assemblies/j2ee-server/project.xml
    geronimo/trunk/etc/project.properties
    geronimo/trunk/modules/assembly/project.xml
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java

Modified: geronimo/trunk/assemblies/j2ee-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-server/project.xml?rev=216234&r1=216233&r2=216234&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-server/project.xml Wed Jul 13 13:50:25 2005
@@ -578,97 +578,6 @@
             </properties>
         </dependency>
 
-        <!--corba support -->
-        <dependency>
-            <groupId>tmporb</groupId>
-            <artifactId>tmporb-orb</artifactId>
-            <version>${tmporb_version}</version>
-            <properties>
-                <geronimo.assemble>repository</geronimo.assemble>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>tmporb</groupId>
-            <artifactId>tmporb-orb-omg</artifactId>
-            <version>${tmporb_version}</version>
-            <properties>
-                <geronimo.assemble>repository</geronimo.assemble>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>tmporb</groupId>
-            <artifactId>tmporb-orb-tools</artifactId>
-            <version>${tmporb_version}</version>
-            <properties>
-                <geronimo.assemble>library</geronimo.assemble>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>tmporb</groupId>
-            <artifactId>tmporb-tools</artifactId>
-            <version>${tmporb_version}</version>
-            <properties>
-                <geronimo.assemble>repository</geronimo.assemble>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>openorb</groupId>
-            <artifactId>openorb-ins</artifactId>
-            <version>${openorb_version}</version>
-            <properties>
-                <geronimo.assemble>repository</geronimo.assemble>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>openorb</groupId>
-            <artifactId>openorb-pss</artifactId>
-            <version>${openorb_version}</version>
-            <properties>
-                <geronimo.assemble>repository</geronimo.assemble>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>openorb</groupId>
-            <artifactId>openorb-ssl</artifactId>
-            <version>${openorb_version}</version>
-            <properties>
-                <geronimo.assemble>repository</geronimo.assemble>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>openorb</groupId>
-            <artifactId>openorb-ots</artifactId>
-            <version>${openorb_version}</version>
-            <properties>
-                <geronimo.assemble>repository</geronimo.assemble>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>avalon</groupId>
-            <artifactId>avalon-framework</artifactId>
-            <version>${avalon_framework_version}</version>
-            <properties>
-               <geronimo.assemble>repository</geronimo.assemble>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>avalon</groupId>
-            <artifactId>avalon-logkit</artifactId>
-            <version>${avalon_logkit_version}</version>
-            <properties>
-               <geronimo.assemble>repository</geronimo.assemble>
-            </properties>
-        </dependency>
-
         <dependency>
             <groupId>bouncycastle</groupId>
             <artifactId>bcprov</artifactId>

Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=216234&r1=216233&r2=216234&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Wed Jul 13 13:50:25 2005
@@ -76,7 +76,6 @@
 activemq_version=3.1-SNAPSHOT
 geronimo_version=1.0-SNAPSHOT
 openejb_version=2.0-SNAPSHOT
-tmporb_version=1.0-SNAPSHOT
 tranql_version=1.0-SNAPSHOT
 tranql_connector_version=1.0-SNAPSHOT
 
@@ -105,8 +104,6 @@
 asm_version=1.4.3
 axion_version=1.0-M3-dev
 axis_version=1.3-SNAPSHOT
-avalon_framework_version=4.1.4
-avalon_logkit_version=1.2.2
 bouncycastle_version=jdk14-124
 cglib_version=HEAD-06-06-05
 castor_version=0.9.5.3
@@ -151,7 +148,6 @@
 maven_version=1.0
 mockobjects_version=0.09
 mx4j_version=3.0.1
-openorb_version=1.4.0-GERONIMO
 oro_version=2.0.8
 p2psockets_version=1.1.2
 regexp_version=1.3

Modified: geronimo/trunk/modules/assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?rev=216234&r1=216233&r2=216234&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Wed Jul 13 13:50:25 2005
@@ -1131,91 +1131,9 @@
             </properties>
         </dependency>
 
-<!--        corba support -->
-        <dependency>
-            <groupId>tmporb</groupId>
-            <artifactId>tmporb-orb</artifactId>
-            <version>${tmporb_version}</version>
-            <properties>
-                <repository>true</repository>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>tmporb</groupId>
-            <artifactId>tmporb-orb-omg</artifactId>
-            <version>${tmporb_version}</version>
-            <properties>
-                <repository>true</repository>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>tmporb</groupId>
-            <artifactId>tmporb-orb-tools</artifactId>
-            <version>${tmporb_version}</version>
-            <properties>
-                <lib>true</lib>
-                <deploy>true</deploy>
-                <repository>true</repository>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>tmporb</groupId>
-            <artifactId>tmporb-tools</artifactId>
-            <version>${tmporb_version}</version>
-            <properties>
-                <repository>true</repository>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>tmporb</groupId>
-            <artifactId>tmporb-ins</artifactId>
-            <version>${tmporb_version}</version>
-            <properties>
-                <repository>true</repository>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>tmporb</groupId>
-            <artifactId>tmporb-pss</artifactId>
-            <version>${tmporb_version}</version>
-            <properties>
-                <repository>true</repository>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>tmporb</groupId>
-            <artifactId>tmporb-ots</artifactId>
-            <version>${tmporb_version}</version>
-            <properties>
-                <repository>true</repository>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>avalon</groupId>
-            <artifactId>avalon-framework</artifactId>
-            <version>${avalon_framework_version}</version>
-            <properties>
-               <repository>true</repository>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>avalon</groupId>
-            <artifactId>avalon-logkit</artifactId>
-            <version>${avalon_logkit_version}</version>
-            <properties>
-               <repository>true</repository>
-            </properties>
-        </dependency>
 
         <dependency>
+            <!-- used for corba asn1 security decoding -->
             <groupId>bouncycastle</groupId>
             <artifactId>bcprov</artifactId>
             <version>${bouncycastle_version}</version>
@@ -1223,8 +1141,6 @@
                <repository>true</repository>
             </properties>
         </dependency>
-
-        <!-- end corba support-->
 
         <!-- spring support-->
         <dependency>

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java?rev=216234&r1=216233&r2=216234&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java (original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java Wed
Jul 13 13:50:25 2005
@@ -57,7 +57,6 @@
     private static Log log;
     private static final ObjectName PERSISTENT_CONFIGURATION_LIST_NAME_QUERY = JMXUtil.getObjectName("*:j2eeType=PersistentConfigurationList,*");
 
-
     private StartupMonitor monitor;
     private List configs = new ArrayList();
     private String verboseArg = null;
@@ -116,9 +115,6 @@
 
             // Install our url factory
             GeronimoURLFactory.install();
-
-            // Install the lame tools jar hack
-            ToolsJarHack.install();
 
             if(verboseArg != null || progressArg != null) {
                 monitor = new SilentStartupMonitor();



Mime
View raw message