geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1081256 - in /geronimo/server/branches/3.0-M2: ./ framework/configs/karaf-framework/src/main/filtered-resources/etc/ plugingroups/console-jetty/src/main/history/ plugingroups/console-tomcat/src/main/history/
Date Mon, 14 Mar 2011 03:33:15 GMT
Author: genspring
Date: Mon Mar 14 03:33:15 2011
New Revision: 1081256

URL: http://svn.apache.org/viewvc?rev=1081256&view=rev
Log:
fix the server can't start problem due to jaxb.

Modified:
    geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
    geronimo/server/branches/3.0-M2/plugingroups/console-jetty/src/main/history/dependencies.xml
    geronimo/server/branches/3.0-M2/plugingroups/console-tomcat/src/main/history/dependencies.xml
    geronimo/server/branches/3.0-M2/pom.xml

Modified: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=1081256&r1=1081255&r2=1081256&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
(original)
+++ geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
Mon Mar 14 03:33:15 2011
@@ -64,7 +64,7 @@ org/apache/servicemix/bundles/org.apache
 org/apache/servicemix/bundles/org.apache.servicemix.bundles.cglib/2.1_3_4/org.apache.servicemix.bundles.cglib-2.1_3_4.jar=40
 org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-jexl/1.1_3/org.apache.servicemix.bundles.commons-jexl-1.1_3.jar=40
 commons-lang/commons-lang/2.5/commons-lang-2.5.jar=40
-org/apache/geronimo/bundles/jaxb-impl/2.2_2-SNAPSHOT/jaxb-impl-2.2_2-SNAPSHOT.jar=40
+org/apache/geronimo/bundles/jaxb-impl/${jaxbImplVersion}/jaxb-impl-${jaxbImplVersion}.jar=40
 org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.1/geronimo-activation_1.1_spec-1.1.jar=40
 org/apache/geronimo/specs/geronimo-jaxb_2.2_spec/1.0.1/geronimo-jaxb_2.2_spec-1.0.1.jar=40
 org/apache/geronimo/specs/geronimo-stax-api_1.2_spec/1.0/geronimo-stax-api_1.2_spec-1.0.jar=40

Modified: geronimo/server/branches/3.0-M2/plugingroups/console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugingroups/console-jetty/src/main/history/dependencies.xml?rev=1081256&r1=1081255&r2=1081256&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugingroups/console-jetty/src/main/history/dependencies.xml
(original)
+++ geronimo/server/branches/3.0-M2/plugingroups/console-jetty/src/main/history/dependencies.xml
Mon Mar 14 03:33:15 2011
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.plugingroups</groupId>
         <artifactId>console-jetty</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
@@ -23,11 +23,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>osgi-console-jetty</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugin-console-jetty</artifactId>
         <type>car</type>
     </dependency>

Modified: geronimo/server/branches/3.0-M2/plugingroups/console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugingroups/console-tomcat/src/main/history/dependencies.xml?rev=1081256&r1=1081255&r2=1081256&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugingroups/console-tomcat/src/main/history/dependencies.xml
(original)
+++ geronimo/server/branches/3.0-M2/plugingroups/console-tomcat/src/main/history/dependencies.xml
Mon Mar 14 03:33:15 2011
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.plugingroups</groupId>
         <artifactId>console-tomcat</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
@@ -23,11 +23,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>osgi-console-tomcat</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugin-console-tomcat</artifactId>
         <type>car</type>
     </dependency>

Modified: geronimo/server/branches/3.0-M2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/pom.xml?rev=1081256&r1=1081255&r2=1081256&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/pom.xml (original)
+++ geronimo/server/branches/3.0-M2/pom.xml Mon Mar 14 03:33:15 2011
@@ -82,6 +82,7 @@
         <txmanagerVersion>3.1</txmanagerVersion>
         <tranqlVersion>1.6</tranqlVersion>
         <tranqlDerbyVersion>1.6</tranqlDerbyVersion>
+        <jaxbImplVersion>2.2.3_1-SNAPSHOT</jaxbImplVersion>
 
         <monitoringConsoleVersion>${project.version}</monitoringConsoleVersion>
         <pax.logging.version>1.5.3</pax.logging.version>
@@ -1395,7 +1396,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>jaxb-impl</artifactId>
-                <version>2.2.3_1-SNAPSHOT</version>
+                <version>${jaxbImplVersion}</version>
             </dependency>
 
             <dependency>



Mime
View raw message