geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r368994 - in /geronimo/branches/1.0: ./ applications/console-standard/src/java/org/apache/geronimo/console/ applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/ applications/console-standard/src/java/or...
Date Sat, 14 Jan 2006 07:07:32 GMT
Author: hogstrom
Date: Fri Jan 13 23:07:18 2006
New Revision: 368994

URL: http://svn.apache.org/viewcvs?rev=368994&view=rev
Log:
Geronimo-1466 1.0.1 Branch Update

Added:
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/GeronimoVersion.java
Modified:
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java
    geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml
    geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml
    geronimo/branches/1.0/configs/daytrader-jetty/project.properties
    geronimo/branches/1.0/configs/daytrader-jetty/project.xml
    geronimo/branches/1.0/configs/daytrader-jetty/src/plan/plan.xml
    geronimo/branches/1.0/configs/daytrader-tomcat/project.properties
    geronimo/branches/1.0/configs/daytrader-tomcat/project.xml
    geronimo/branches/1.0/configs/daytrader-tomcat/src/plan/plan.xml
    geronimo/branches/1.0/etc/project.properties
    geronimo/branches/1.0/maven.xml
    geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.properties
    geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.xml
    geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.properties
    geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.xml
    geronimo/branches/1.0/plugins/geronimo-deployment-plugin/plugin.properties
    geronimo/branches/1.0/plugins/geronimo-deployment-plugin/project.properties
    geronimo/branches/1.0/plugins/geronimo-deployment-plugin/project.xml
    geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.properties
    geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.xml
    geronimo/branches/1.0/plugins/geronimo-packaging-plugin/plugin.properties
    geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.properties
    geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.xml

Added: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/GeronimoVersion.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/GeronimoVersion.java?rev=368994&view=auto
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/GeronimoVersion.java
(added)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/GeronimoVersion.java
Fri Jan 13 23:07:18 2006
@@ -0,0 +1,9 @@
+package org.apache.geronimo.console;
+
+/**
+ */
+public final class GeronimoVersion {
+
+    public final static String GERONIMO_VERSION = "1.0.1-SNAPSHOT";
+
+}

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
(original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
Fri Jan 13 23:07:18 2006
@@ -64,6 +64,7 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.DocumentBuilder;
 import org.apache.geronimo.console.BasePortlet;
+import org.apache.geronimo.console.GeronimoVersion;
 import org.apache.geronimo.console.util.PortletManager;
 import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory;
 import org.apache.geronimo.management.geronimo.ResourceAdapterModule;
@@ -816,6 +817,7 @@
                 Connector15DCBRoot root = (Connector15DCBRoot) config.getDConfigBeanRoot(ddBeanRoot);
                 ConnectorDCB connector = (ConnectorDCB) root.getDConfigBean(ddBeanRoot.getChildBean(root.getXpaths()[0])[0]);
                 connector.setConfigID("user/database-pool-"+data.getName() + "/1/car");
+                connector.setParentID("geronimo/j2ee-server/" + GeronimoVersion.GERONIMO_VERSION
+ "/car");
                 // Use a parentId of null to pick up the default
                 if(data.jar1 != null && !data.jar1.equals("")) {
                     Dependency dep = new Dependency();

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java
(original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java
Fri Jan 13 23:07:18 2006
@@ -28,10 +28,11 @@
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.geronimo.console.GeronimoVersion;
 
 public abstract class AbstractJMSManager {
 
-    protected static final String JMS_SERVER_MBEAN_NAME = "geronimo.server:J2EEApplication=null,J2EEModule=geronimo/activemq-broker/1.0/car,J2EEServer=geronimo,j2eeType=JMSServer,name=ActiveMQl";
+    protected static final String JMS_SERVER_MBEAN_NAME = "geronimo.server:J2EEApplication=null,J2EEModule=geronimo/activemq-broker/"
+ GeronimoVersion.GERONIMO_VERSION + "/car,J2EEServer=geronimo,j2eeType=JMSServer,name=ActiveMQl";
 
     protected static final String GET_BROKER_ADMIN_FUNCTION = "getBrokerAdmin";
 
@@ -57,7 +58,7 @@
 
     protected static final String DESTINATION_CONFIG_URI = "destinationConfigURI";
 
-    protected static final String CONNECTION_FACTORY_NAME = "geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=geronimo/activemq/1.0/car,j2eeType=JCAManagedConnectionFactory,name=DefaultActiveMQConnectionFactory";
+    protected static final String CONNECTION_FACTORY_NAME = "geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=geronimo/activemq/"
+ GeronimoVersion.GERONIMO_VERSION + "/car,j2eeType=JCAManagedConnectionFactory,name=DefaultActiveMQConnectionFactory";
 
     protected static Object[] no_args = new Object[0];
 

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java
(original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java
Fri Jan 13 23:07:18 2006
@@ -18,6 +18,7 @@
 package org.apache.geronimo.console.jmsmanager;
 
 import org.apache.geronimo.console.BasePortlet;
+import org.apache.geronimo.console.GeronimoVersion;
 import org.apache.geronimo.console.databasemanager.DataSourceInfo;
 import org.apache.geronimo.console.jmsmanager.activemqCF.ActiveMQConnectorHelper;
 import org.apache.geronimo.gbean.GAttributeInfo;
@@ -53,7 +54,7 @@
 
     private final static ActiveMQConnectorHelper helper = new ActiveMQConnectorHelper();
 
-    private final static String PARENT_ID = "geronimo/activemq-broker/1.0/car";
+    private final static String PARENT_ID = "geronimo/activemq-broker/" + GeronimoVersion.GERONIMO_VERSION
+ "/car";
 
     private final static String ADD_MODE = "addACF";
 

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java
(original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java
Fri Jan 13 23:07:18 2006
@@ -23,6 +23,7 @@
 import org.apache.geronimo.connector.AdminObjectWrapperGBean;
 import org.apache.geronimo.console.core.jms.TopicBrowserGBean;
 import org.apache.geronimo.console.jmsmanager.AbstractJMSManager;
+import org.apache.geronimo.console.GeronimoVersion;
 import org.apache.geronimo.gbean.DynamicGAttributeInfo;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
@@ -49,7 +50,7 @@
     protected static Log log = LogFactory
             .getLog(CreateDestinationHandler.class);
 
-    private static final List parentId = Arrays.asList(new URI[] {URI.create("geronimo/activemq-broker/1.0/car")});
+    private static final List parentId = Arrays.asList(new URI[] {URI.create("geronimo/activemq-broker/"
+ GeronimoVersion.GERONIMO_VERSION + "/car")});
 
     static final GBeanInfo QUEUE_INFO;
 
@@ -156,4 +157,4 @@
         response.setRenderParameter("processAction", "viewDestinations");
     }
 
-}
\ No newline at end of file
+}

Modified: geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml Fri Jan 13 23:07:18 2006
@@ -304,7 +304,7 @@
             <groupId>geronimo</groupId>
             <artifactId>daytrader-derby-jetty-streamer-client</artifactId>
             <type>car</type>
-            <version>${pom.currentVersion}</version>
+            <version>${daytrader_version}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>

Modified: geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml Fri Jan 13 23:07:18 2006
@@ -295,7 +295,7 @@
             <groupId>geronimo</groupId>
             <artifactId>daytrader-derby-tomcat-streamer-client</artifactId>
             <type>car</type>
-            <version>${pom.currentVersion}</version>
+            <version>${daytrader_version}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>

Modified: geronimo/branches/1.0/configs/daytrader-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/daytrader-jetty/project.properties?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/daytrader-jetty/project.properties (original)
+++ geronimo/branches/1.0/configs/daytrader-jetty/project.properties Fri Jan 13 23:07:18 2006
@@ -23,5 +23,5 @@
 
 geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car
 
-geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/ears/daytrader-ear-${pom.currentVersion}.ear
+geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/ears/daytrader-ear-${daytrader_version}.ear
 

Modified: geronimo/branches/1.0/configs/daytrader-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/daytrader-jetty/project.xml?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/daytrader-jetty/project.xml (original)
+++ geronimo/branches/1.0/configs/daytrader-jetty/project.xml Fri Jan 13 23:07:18 2006
@@ -72,7 +72,7 @@
     <dependency>
         <groupId>geronimo</groupId>
         <artifactId>daytrader-ear</artifactId>
-        <version>${pom.currentVersion}</version>
+        <version>${daytrader_version}</version>
             <type>ear</type>
     </dependency>
 

Modified: geronimo/branches/1.0/configs/daytrader-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/daytrader-jetty/src/plan/plan.xml?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/daytrader-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.0/configs/daytrader-jetty/src/plan/plan.xml Fri Jan 13 23:07:18 2006
@@ -3,7 +3,7 @@
     configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car">
 
     <module>
-        <web>daytrader-web-${pom.currentVersion}.war</web>
+        <web>daytrader-web-${daytrader_version}.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
             configId="Web" parentId="Trade">
             <context-priority-classloader>false</context-priority-classloader>
@@ -508,7 +508,7 @@
         <java>daytrader-streamer-1.0.jar</java>
         <application-client  xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.0"
             configId="foo"
-            clientConfigId="${pom.groupId}/${pom.artifactId}-streamer-client/${pom.currentVersion}/car">
+            clientConfigId="${pom.groupId}/${pom.artifactId}-streamer-client/${daytrader_version}/car">
             <resource>
                 <external-rar>activemq/activemq-ra/${activemq_version}/rar</external-rar>
                 <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"

Modified: geronimo/branches/1.0/configs/daytrader-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/daytrader-tomcat/project.properties?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/daytrader-tomcat/project.properties (original)
+++ geronimo/branches/1.0/configs/daytrader-tomcat/project.properties Fri Jan 13 23:07:18
2006
@@ -23,5 +23,5 @@
 
 geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car
 
-geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/ears/daytrader-ear-${pom.currentVersion}.ear
+geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/ears/daytrader-ear-${daytrader_version}.ear
 

Modified: geronimo/branches/1.0/configs/daytrader-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/daytrader-tomcat/project.xml?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/daytrader-tomcat/project.xml (original)
+++ geronimo/branches/1.0/configs/daytrader-tomcat/project.xml Fri Jan 13 23:07:18 2006
@@ -74,7 +74,7 @@
     <dependency>
         <groupId>geronimo</groupId>
         <artifactId>daytrader-ear</artifactId>
-        <version>${pom.currentVersion}</version>
+        <version>${daytrader_version}</version>
             <type>ear</type>
     </dependency>
 

Modified: geronimo/branches/1.0/configs/daytrader-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/daytrader-tomcat/src/plan/plan.xml?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/daytrader-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/1.0/configs/daytrader-tomcat/src/plan/plan.xml Fri Jan 13 23:07:18 2006
@@ -3,7 +3,7 @@
     configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car">
 
     <module>
-        <web>daytrader-web-${pom.currentVersion}.war</web>
+        <web>daytrader-web-${daytrader_version}.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
             configId="Web" parentId="Trade">
             <context-priority-classloader>false</context-priority-classloader>
@@ -508,7 +508,7 @@
         <java>daytrader-streamer-1.0.jar</java>
         <application-client  xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.0"
             configId="foo"
-            clientConfigId="${pom.groupId}/${pom.artifactId}-streamer-client/${pom.currentVersion}/car">
+            clientConfigId="${pom.groupId}/${pom.artifactId}-streamer-client/${daytrader_version}/car">
             <resource>
                 <external-rar>activemq/activemq-ra/${activemq_version}/rar</external-rar>
                 <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"

Modified: geronimo/branches/1.0/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/etc/project.properties?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/etc/project.properties (original)
+++ geronimo/branches/1.0/etc/project.properties Fri Jan 13 23:07:18 2006
@@ -80,16 +80,16 @@
 #####################################################
 activeio_version=2.0-r118
 activemq_version=3.2.1
-geronimo_version=1.0
+geronimo_version=1.0.1-SNAPSHOT
 openejb_version=2.0
 tranql_version=1.2.1
 tranql_connector_version=1.1
 tranql_vendors_version=1.1
 
-geronimo_packaging_plugin_version=1.0.1
-geronimo_assembly_plugin_version=1.0.3
-geronimo_deployment_plugin_version=1.0.0
-geronimo_dependency_plugin_version=1.0.0
+geronimo_packaging_plugin_version=1.0.2
+geronimo_assembly_plugin_version=1.0.4
+geronimo_deployment_plugin_version=1.0.1
+geronimo_dependency_plugin_version=1.0.1
 
 geronimo_spec_activation_version=1.0
 geronimo_spec_corba_version=1.0
@@ -135,6 +135,7 @@
 commons_primitives_version=20041207.202534
 commons_pool_version=1.2
 concurrent_version=1.3.4
+daytrader_version=1.0
 derby_version=10.1.1.0
 dom4j_version=1.4
 dwr_version=1.0
@@ -147,7 +148,7 @@
 jdbm_version=0.20-dev
 jdom_version=1.0
 jelly_velocity_tags_version=1.0
-jetty_version=5.1.9
+jetty_version=5.1.10
 jstl_version=1.1.1
 juddi_version=0.9rc4
 junit_version=3.8.1

Modified: geronimo/branches/1.0/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/maven.xml?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/maven.xml (original)
+++ geronimo/branches/1.0/maven.xml Fri Jan 13 23:07:18 2006
@@ -49,7 +49,7 @@
     </goal>
 
     <goal name="new3">
-        <maven:reactor basedir="${basedir}" includes="applications/*/project.xml,applications/daytrader/*/project.xml"
+        <maven:reactor basedir="${basedir}" includes="applications/*/project.xml"
             excludes="" goals="multiproject:install-callback" banner="applications" ignoreFailures="false"
/>
     </goal>
 

Modified: geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.properties?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.properties Fri Jan 13 23:07:18
2006
@@ -22,7 +22,7 @@
 maven.compile.source=1.4
 maven.compile.target=1.4
 
-geronimoVersion=1.0
-geronimo_version=1.0
+geronimoVersion=1.0.1-SNAPSHOT
+geronimo_version=1.0.1-SNAPSHOT
 maven.multiproject.type=plugin
 

Modified: geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.xml?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.xml (original)
+++ geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.xml Fri Jan 13 23:07:18
2006
@@ -23,18 +23,18 @@
     <id>geronimo-assembly-plugin</id>
     <name>Geronimo :: Maven Assembly Plugin</name>
     <description>A plugin used to assemble a distribution of Geronimo</description>
-    <currentVersion>1.0.3</currentVersion>
+    <currentVersion>1.0.4</currentVersion>
 
     <dependencies>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>1.0</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>
-            <version>1.0</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.properties?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.properties Fri Jan 13
23:07:18 2006
@@ -22,8 +22,8 @@
 maven.compile.source=1.4
 maven.compile.target=1.4
 
-geronimoVersion=1.0
-geronimo_version=1.0
+geronimoVersion=1.0.1-SNAPSHOT
+geronimo_version=1.0.1-SNAPSHOT
 
 maven.multiproject.type=plugin
 

Modified: geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.xml?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.xml (original)
+++ geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.xml Fri Jan 13 23:07:18
2006
@@ -23,7 +23,7 @@
     <id>geronimo-dependency-plugin</id>
     <name>Geronimo :: Maven Dependency Plugin</name>
     <description>A plugin used to construct a geronimo-service.xml dependency list
for a Geronimo module</description>
-    <currentVersion>1.0.0</currentVersion>
+    <currentVersion>1.0.1</currentVersion>
 
     <dependencies>
         <dependency>
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-service-builder</artifactId>
-            <version>1.0</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/branches/1.0/plugins/geronimo-deployment-plugin/plugin.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-deployment-plugin/plugin.properties?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-deployment-plugin/plugin.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-deployment-plugin/plugin.properties Fri Jan 13
23:07:18 2006
@@ -21,5 +21,5 @@
 
 geronimoGroupId=geronimo
 geronimoArtifactId=geronimo
-geronimoVersion=1.0
+geronimoVersion=1.0.1-SNAPSHOT
 geronimo.deploy.var.source=src/var

Modified: geronimo/branches/1.0/plugins/geronimo-deployment-plugin/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-deployment-plugin/project.properties?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-deployment-plugin/project.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-deployment-plugin/project.properties Fri Jan 13
23:07:18 2006
@@ -29,4 +29,4 @@
 
 maven.multiproject.type=plugin
 
-geronimo_version=1.0
+geronimo_version=1.0.1-SNAPSHOT

Modified: geronimo/branches/1.0/plugins/geronimo-deployment-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-deployment-plugin/project.xml?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-deployment-plugin/project.xml (original)
+++ geronimo/branches/1.0/plugins/geronimo-deployment-plugin/project.xml Fri Jan 13 23:07:18
2006
@@ -32,7 +32,7 @@
     <package>org.apache.geronimo</package>
     <logo></logo>
 
-    <currentVersion>1.0.0</currentVersion>
+    <currentVersion>1.0.1</currentVersion>
 
     <dependencies>
         <dependency>

Modified: geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.properties?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.properties Fri Jan 13 23:07:18
2006
@@ -23,8 +23,8 @@
 maven.compile.source=1.4
 maven.compile.target=1.4
 
-geronimoVersion=1.0
-geronimo_version=1.0
+geronimoVersion=1.0.1-SNAPSHOT
+geronimo_version=1.0.1-SNAPSHOT
 
 maven.multiproject.type=plugin
 

Modified: geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.xml?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.xml (original)
+++ geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.xml Fri Jan 13 23:07:18 2006
@@ -23,18 +23,18 @@
     <id>geronimo-izpack-plugin</id>
     <name>Geronimo :: IZPack Installer Build Plugin</name>
     <description>A plugin used to build an IZPack based installer for Geronimo</description>
-    <currentVersion>1.0</currentVersion>
+    <currentVersion>1.0.1-SNAPSHOT</currentVersion>
 
     <dependencies>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>1.0</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>
-            <version>1.0</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>izpack</groupId>

Modified: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/plugin.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-packaging-plugin/plugin.properties?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-packaging-plugin/plugin.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-packaging-plugin/plugin.properties Fri Jan 13 23:07:18
2006
@@ -19,7 +19,7 @@
 ## $Rev$ $Date$
 ##
 
-geronimo.packaging.geronimo_version=1.0
+geronimo.packaging.geronimo_version=1.0.1-SNAPSHOT
 
 geronimo.packaging.srcDir=${basedir}/src/plan
 geronimo.packaging.planFile=plan.xml

Modified: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.properties?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.properties Fri Jan 13
23:07:18 2006
@@ -26,4 +26,4 @@
 
 maven.multiproject.type=plugin
 
-geronimo_version=1.0
+geronimo_version=1.0.1-SNAPSHOT

Modified: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.xml?rev=368994&r1=368993&r2=368994&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.xml (original)
+++ geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.xml Fri Jan 13 23:07:18
2006
@@ -22,13 +22,13 @@
     <groupId>geronimo</groupId>
     <id>geronimo-packaging-plugin</id>
     <name>Geronimo :: Maven Packaging Plugin</name>
-    <currentVersion>1.0.1</currentVersion>
+    <currentVersion>1.0.2</currentVersion>
 
     <dependencies>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>1.0</version>
+            <version>1.0.1-SNAPSHOT</version>
             <properties>
                 <packaging.classpath>true</packaging.classpath>
             </properties>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>
-            <version>1.0</version>
+            <version>1.0.1-SNAPSHOT</version>
             <properties>
                 <packaging.classpath>true</packaging.classpath>
             </properties>
@@ -97,7 +97,7 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-service-builder</artifactId>
-            <version>1.0</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>xmlbeans</groupId>



Mime
View raw message