geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: r232323 - in /geronimo/trunk: applications/console-ear/src/plan/geronimo-application.xml etc/project.properties modules/assembly/project.xml modules/assembly/src/plan/system-database-plan.xml
Date Fri, 12 Aug 2005 15:51:37 GMT
Author: jboynes
Date: Fri Aug 12 08:51:33 2005
New Revision: 232323

URL: http://svn.apache.org/viewcvs?rev=232323&view=rev
Log:
upgrade to Derby 10.1 and clean up console dependencies

Modified:
    geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml
    geronimo/trunk/etc/project.properties
    geronimo/trunk/modules/assembly/project.xml
    geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml

Modified: geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml?rev=232323&r1=232322&r2=232323&view=diff
==============================================================================
--- geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml (original)
+++ geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml Fri Aug 12 08:51:33
2005
@@ -12,71 +12,10 @@
         <uri>org.apache.pluto/jars/pluto-${pluto_version}.jar</uri>
     </dependency>
 
-	<!-- Active MQ dependencies -->
-    <dependency>
-        <uri>activemq/jars/activemq-core-${activemq_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>activemq/jars/activemq-gbean-${activemq_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>activeio/jars/activeio-${activeio_version}.jar</uri>
-    </dependency>
-    
-     <!-- Deployer dependencies -->    
-    <dependency>
-        <uri>geronimo/jars/geronimo-deployment-${pom.currentVersion}.jar</uri>
-    </dependency>        
-    <dependency>    
-        <uri>geronimo/jars/geronimo-common-${pom.currentVersion}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>geronimo/jars/geronimo-connector-builder-${pom.currentVersion}.jar</uri>
-    </dependency>
-    <dependency>    
-        <!-- <uri>geronimo/jars/geronimo-derby-connector-${pom.currentVersion}.jar</uri>
-->
-        <uri>geronimo/jars/geronimo-connector-${pom.currentVersion}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>geronimo/jars/geronimo-j2ee-builder-${pom.currentVersion}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>geronimo/jars/geronimo-naming-builder-${pom.currentVersion}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>geronimo/jars/geronimo-jetty-builder-${pom.currentVersion}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>geronimo/jars/geronimo-client-builder-${pom.currentVersion}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>geronimo/jars/geronimo-security-builder-${pom.currentVersion}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>geronimo/jars/geronimo-service-builder-${pom.currentVersion}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>xmlbeans/jars/xbean-${xmlbeans_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>geronimo/jars/geronimo-j2ee-schema-${pom.currentVersion}.jar</uri>
-    </dependency>
- 
     <dependency>
         <uri>geronimo/jars/geronimo-console-core-${pom.currentVersion}.jar</uri>
     </dependency>
 
-    <dependency>
-        <uri>incubator-derby/jars/derby-${derby_version}.jar</uri> 
-    </dependency>
-    <dependency>
-        <uri>incubator-derby/jars/derbynet-${derby_version}.jar</uri>
-    </dependency>
-    
-    <dependency>
-        <uri>geronimo/jars/geronimo-derby-${pom.currentVersion}.jar</uri> 
-    </dependency>
-
     <module>
         <web>geronimo-console-framework-${pom.currentVersion}.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/web" configId="console">
@@ -106,8 +45,7 @@
         </web-app>
     </module>
 
-    <!-- Console specific server info
-    <gbean name="SEServerInfo" class="org.apache.geronimo.console.core.system.serverinfo.SEServerInfo"/>-->
+    <!-- Console specific server info -->
     <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
         <reference name="ServerInfo"><gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/System,J2EEServer=geronimo,j2eeType=GBean,name=ServerInfo</gbean-name></reference>
         <reference name="LoginModule">

Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=232323&r1=232322&r2=232323&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Fri Aug 12 08:51:33 2005
@@ -126,7 +126,7 @@
 commons_primitives_version=1.0
 commons_pool_version=1.2
 concurrent_version=1.3.4
-derby_version=10.0.2.1
+derby_version=10.1.1.0
 dom4j_version=1.4
 eclipse_compiler_version=3.0.1
 howl_version=0.1.8

Modified: geronimo/trunk/modules/assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?rev=232323&r1=232322&r2=232323&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Fri Aug 12 08:51:33 2005
@@ -569,7 +569,7 @@
         </dependency>
 
         <dependency>
-            <groupId>incubator-derby</groupId>
+            <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
             <version>${derby_version}</version>
             <properties>
@@ -578,8 +578,26 @@
         </dependency>
 
         <dependency>
-            <groupId>incubator-derby</groupId>
+            <groupId>org.apache.derby</groupId>
             <artifactId>derbynet</artifactId>
+            <version>${derby_version}</version>
+            <properties>
+                <repository>true</repository>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbyclient</artifactId>
+            <version>${derby_version}</version>
+            <properties>
+                <repository>true</repository>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbytools</artifactId>
             <version>${derby_version}</version>
             <properties>
                 <repository>true</repository>

Modified: geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml?rev=232323&r1=232322&r2=232323&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml Fri Aug 12 08:51:33
2005
@@ -24,10 +24,10 @@
     parentId="org/apache/geronimo/Server">
 
     <dependency>
-        <uri>incubator-derby/jars/derby-${derby_version}.jar</uri>
+        <uri>org.apache.derby/jars/derby-${derby_version}.jar</uri>
     </dependency>
     <dependency>
-        <uri>incubator-derby/jars/derbynet-${derby_version}.jar</uri>
+        <uri>org.apache.derby/jars/derbynet-${derby_version}.jar</uri>
     </dependency>
     <dependency>
         <uri>geronimo/jars/geronimo-derby-${geronimo_version}.jar</uri>



Mime
View raw message