You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/01/12 09:09:28 UTC
svn commit: r368307 - in /geronimo/trunk:
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/org/apache/g...
Author: djencks
Date: Thu Jan 12 00:09:02 2006
New Revision: 368307
URL: http://svn.apache.org/viewcvs?rev=368307&view=rev
Log:
GERONIMO-1457 to 1.1-SNAPSHOT
Added:
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/GeronimoVersion.java
Modified:
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java
geronimo/trunk/applications/daytrader/ear/src/application/META-INF/application.xml
geronimo/trunk/applications/daytrader/streamer/src/client/META-INF/MANIFEST.MF
geronimo/trunk/applications/daytrader/web/src/webapp/WEB-INF/web.xml
geronimo/trunk/applications/daytrader/wsappclient/src/client/META-INF/MANIFEST.MF
geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml
geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml
geronimo/trunk/etc/project.properties
geronimo/trunk/plugins/geronimo-assembly-plugin/project.properties
geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml
geronimo/trunk/plugins/geronimo-dependency-plugin/project.properties
geronimo/trunk/plugins/geronimo-dependency-plugin/project.xml
geronimo/trunk/plugins/geronimo-deployment-plugin/plugin.properties
geronimo/trunk/plugins/geronimo-deployment-plugin/project.properties
geronimo/trunk/plugins/geronimo-deployment-plugin/project.xml
geronimo/trunk/plugins/geronimo-izpack-plugin/project.properties
geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.properties
geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml
Added: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/GeronimoVersion.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/GeronimoVersion.java?rev=368307&view=auto
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/GeronimoVersion.java (added)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/GeronimoVersion.java Thu Jan 12 00:09:02 2006
@@ -0,0 +1,9 @@
+package org.apache.geronimo.console;
+
+/**
+ */
+public final class GeronimoVersion {
+
+ public final static String GERONIMO_VERSION = "1.1-SNAPSHOT";
+
+}
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=368307&r1=368306&r2=368307&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java Thu Jan 12 00:09:02 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,7 +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/1.0-SNAPSHOT/car");
+ connector.setParentID("geronimo/j2ee-server/" + GeronimoVersion.GERONIMO_VERSION + "/car");
if(data.jar1 != null && !data.jar1.equals("")) {
Dependency dep = new Dependency();
connector.setDependency(new Dependency[]{dep});
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java?rev=368307&r1=368306&r2=368307&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java Thu Jan 12 00:09:02 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-SNAPSHOT/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-SNAPSHOT/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/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java?rev=368307&r1=368306&r2=368307&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java Thu Jan 12 00:09:02 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-SNAPSHOT/car";
+ private final static String PARENT_ID = "geronimo/activemq-broker/" + GeronimoVersion.GERONIMO_VERSION + "/car";
private final static String ADD_MODE = "addACF";
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java?rev=368307&r1=368306&r2=368307&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java Thu Jan 12 00:09:02 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-SNAPSHOT/car")});
+ private static final List parentId = Arrays.asList(new URI[] {URI.create("geronimo/activemq-broker/" + GeronimoVersion.GERONIMO_VERSION + "/car")});
static final GBeanInfo QUEUE_INFO;
Modified: geronimo/trunk/applications/daytrader/ear/src/application/META-INF/application.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/ear/src/application/META-INF/application.xml?rev=368307&r1=368306&r2=368307&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/ear/src/application/META-INF/application.xml (original)
+++ geronimo/trunk/applications/daytrader/ear/src/application/META-INF/application.xml Thu Jan 12 00:09:02 2006
@@ -5,18 +5,18 @@
<description>Application description</description>
<display-name>Trade</display-name>
<module>
- <java>daytrader-streamer-1.0-SNAPSHOT.jar</java>
+ <java>daytrader-streamer-1.1-SNAPSHOT.jar</java>
</module>
<module>
- <java>daytrader-wsappclient-1.0-SNAPSHOT.jar</java>
+ <java>daytrader-wsappclient-1.1-SNAPSHOT.jar</java>
</module>
<module>
<web>
- <web-uri>daytrader-web-1.0-SNAPSHOT.war</web-uri>
+ <web-uri>daytrader-web-1.1-SNAPSHOT.war</web-uri>
<context-root>/daytrader</context-root>
</web>
</module>
<module>
- <ejb>daytrader-ejb-1.0-SNAPSHOT.jar</ejb>
+ <ejb>daytrader-ejb-1.1-SNAPSHOT.jar</ejb>
</module>
</application>
Modified: geronimo/trunk/applications/daytrader/streamer/src/client/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/streamer/src/client/META-INF/MANIFEST.MF?rev=368307&r1=368306&r2=368307&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/streamer/src/client/META-INF/MANIFEST.MF (original)
+++ geronimo/trunk/applications/daytrader/streamer/src/client/META-INF/MANIFEST.MF Thu Jan 12 00:09:02 2006
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
-Class-Path: daytrader-ejb-1.0-SNAPSHOT.jar
+Class-Path: daytrader-ejb-1.1-SNAPSHOT.jar
Created-By: 1.4.2_08 (Sun Microsystems Inc.)
Ant-Version: Apache Ant 1.5.4
Main-Class: org.apache.geronimo.samples.daytrader.client.TradeClient
Modified: geronimo/trunk/applications/daytrader/web/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/web/src/webapp/WEB-INF/web.xml?rev=368307&r1=368306&r2=368307&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/web/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/trunk/applications/daytrader/web/src/webapp/WEB-INF/web.xml Thu Jan 12 00:09:02 2006
@@ -410,13 +410,13 @@
<message-destination-ref-name>jms/TradeBrokerQueue</message-destination-ref-name>
<message-destination-type>javax.jms.Queue</message-destination-type>
<message-destination-usage>Produces</message-destination-usage>
- <message-destination-link>daytrader-ejb-1.0-SNAPSHOT.jar#TradeBrokerQueue</message-destination-link>
+ <message-destination-link>daytrader-ejb-1.1-SNAPSHOT.jar#TradeBrokerQueue</message-destination-link>
</message-destination-ref>
<message-destination-ref id="MessageDestinationRef_2">
<message-destination-ref-name>jms/TradeStreamerTopic</message-destination-ref-name>
<message-destination-type>javax.jms.Topic</message-destination-type>
<message-destination-usage>Produces</message-destination-usage>
- <message-destination-link>daytrader-ejb-1.0-SNAPSHOT.jar#TradeStreamerTopic</message-destination-link>
+ <message-destination-link>daytrader-ejb-1.1-SNAPSHOT.jar#TradeStreamerTopic</message-destination-link>
</message-destination-ref>
<service-ref>
<description>WSDL Service Trade</description>
Modified: geronimo/trunk/applications/daytrader/wsappclient/src/client/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/wsappclient/src/client/META-INF/MANIFEST.MF?rev=368307&r1=368306&r2=368307&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/wsappclient/src/client/META-INF/MANIFEST.MF (original)
+++ geronimo/trunk/applications/daytrader/wsappclient/src/client/META-INF/MANIFEST.MF Thu Jan 12 00:09:02 2006
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
-Class-Path: daytrader-ejb-1.0-SNAPSHOT.jar
+Class-Path: daytrader-ejb-1.1-SNAPSHOT.jar
Created-By: 1.4.2_08 (Sun Microsystems Inc.)
Ant-Version: Apache Ant 1.5.4
Main-Class: org.apache.geronimo.samples.daytrader.client.ws.ClientApp
Modified: geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml?rev=368307&r1=368306&r2=368307&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml Thu Jan 12 00:09:02 2006
@@ -30,7 +30,7 @@
##
-->
<module>
- <ejb>daytrader-ejb-1.0-SNAPSHOT.jar</ejb> <!-- Note this must match the -->
+ <ejb>daytrader-ejb-${pom.currentVersion}.jar</ejb> <!-- Note this must match the -->
<openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.0"
configId="TradeEJBs"
>
@@ -505,7 +505,7 @@
<module>
- <java>daytrader-streamer-1.0-SNAPSHOT.jar</java>
+ <java>daytrader-streamer-${pom.currentVersion}.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">
Modified: geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml?rev=368307&r1=368306&r2=368307&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml Thu Jan 12 00:09:02 2006
@@ -30,7 +30,7 @@
##
-->
<module>
- <ejb>daytrader-ejb-1.0-SNAPSHOT.jar</ejb> <!-- Note this must match the -->
+ <ejb>daytrader-ejb-${pom.currentVersion}.jar</ejb> <!-- Note this must match the -->
<openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.0"
configId="TradeEJBs"
>
@@ -505,7 +505,7 @@
<module>
- <java>daytrader-streamer-1.0-SNAPSHOT.jar</java>
+ <java>daytrader-streamer-${pom.currentVersion}.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">
Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=368307&r1=368306&r2=368307&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Thu Jan 12 00:09:02 2006
@@ -78,17 +78,17 @@
#####################################################
activeio_version=2.0-r118
activemq_version=3.2.1
-geronimo_version=1.0-SNAPSHOT
-openejb_version=2.0-SNAPSHOT
+geronimo_version=1.1-SNAPSHOT
+openejb_version=2.1-SNAPSHOT
tranql_version=1.2.1
tranql_connector_version=1.1
tranql_vendors_version=1.1
release_notes_version=1.0
-geronimo_packaging_plugin_version=1.1.1
-geronimo_assembly_plugin_version=1.1.3
-geronimo_deployment_plugin_version=1.1.0
-geronimo_dependency_plugin_version=1.1.0
+geronimo_packaging_plugin_version=1.1.2
+geronimo_assembly_plugin_version=1.1.4
+geronimo_deployment_plugin_version=1.1.1
+geronimo_dependency_plugin_version=1.1.1
geronimo_spec_activation_version=1.0
geronimo_spec_corba_version=1.0
Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/project.properties?rev=368307&r1=368306&r2=368307&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/project.properties (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/project.properties Thu Jan 12 00:09:02 2006
@@ -22,7 +22,7 @@
maven.compile.source=1.4
maven.compile.target=1.4
-geronimoVersion=1.0-SNAPSHOT
+geronimoVersion=1.1-SNAPSHOT
maven.multiproject.type=plugin
Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml?rev=368307&r1=368306&r2=368307&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml Thu Jan 12 00:09:02 2006
@@ -23,7 +23,7 @@
<id>geronimo-assembly-plugin</id>
<name>Geronimo :: Maven Assembly Plugin</name>
<description>A plugin used to assemble a distribution of Geronimo</description>
- <currentVersion>1.1.3</currentVersion>
+ <currentVersion>1.1.4</currentVersion>
<dependencies>
<dependency>
Modified: geronimo/trunk/plugins/geronimo-dependency-plugin/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-dependency-plugin/project.properties?rev=368307&r1=368306&r2=368307&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-dependency-plugin/project.properties (original)
+++ geronimo/trunk/plugins/geronimo-dependency-plugin/project.properties Thu Jan 12 00:09:02 2006
@@ -22,8 +22,8 @@
maven.compile.source=1.4
maven.compile.target=1.4
-geronimoVersion=1.0-SNAPSHOT
-geronimo_version=1.0-SNAPSHOT
+geronimoVersion=1.1-SNAPSHOT
+geronimo_version=1.1-SNAPSHOT
maven.multiproject.type=plugin
Modified: geronimo/trunk/plugins/geronimo-dependency-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-dependency-plugin/project.xml?rev=368307&r1=368306&r2=368307&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-dependency-plugin/project.xml (original)
+++ geronimo/trunk/plugins/geronimo-dependency-plugin/project.xml Thu Jan 12 00:09:02 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.1.0</currentVersion>
+ <currentVersion>1.1.1</currentVersion>
<dependencies>
<dependency>
Modified: geronimo/trunk/plugins/geronimo-deployment-plugin/plugin.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-deployment-plugin/plugin.properties?rev=368307&r1=368306&r2=368307&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-deployment-plugin/plugin.properties (original)
+++ geronimo/trunk/plugins/geronimo-deployment-plugin/plugin.properties Thu Jan 12 00:09:02 2006
@@ -21,5 +21,5 @@
geronimoGroupId=geronimo
geronimoArtifactId=geronimo
-geronimoVersion=1.0-SNAPSHOT
+geronimoVersion=1.1-SNAPSHOT
geronimo.deploy.var.source=src/var
Modified: geronimo/trunk/plugins/geronimo-deployment-plugin/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-deployment-plugin/project.properties?rev=368307&r1=368306&r2=368307&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-deployment-plugin/project.properties (original)
+++ geronimo/trunk/plugins/geronimo-deployment-plugin/project.properties Thu Jan 12 00:09:02 2006
@@ -29,4 +29,4 @@
maven.multiproject.type=plugin
-geronimo_version=1.0-SNAPSHOT
+geronimo_version=1.1-SNAPSHOT
Modified: geronimo/trunk/plugins/geronimo-deployment-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-deployment-plugin/project.xml?rev=368307&r1=368306&r2=368307&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-deployment-plugin/project.xml (original)
+++ geronimo/trunk/plugins/geronimo-deployment-plugin/project.xml Thu Jan 12 00:09:02 2006
@@ -32,7 +32,7 @@
<package>org.apache.geronimo</package>
<logo></logo>
- <currentVersion>1.1.0</currentVersion>
+ <currentVersion>1.1.1</currentVersion>
<dependencies>
<dependency>
Modified: geronimo/trunk/plugins/geronimo-izpack-plugin/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-izpack-plugin/project.properties?rev=368307&r1=368306&r2=368307&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-izpack-plugin/project.properties (original)
+++ geronimo/trunk/plugins/geronimo-izpack-plugin/project.properties Thu Jan 12 00:09:02 2006
@@ -23,7 +23,7 @@
maven.compile.source=1.4
maven.compile.target=1.4
-geronimoVersion=1.0-SNAPSHOT
+geronimoVersion=1.1-SNAPSHOT
maven.multiproject.type=plugin
Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.properties?rev=368307&r1=368306&r2=368307&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.properties (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.properties Thu Jan 12 00:09:02 2006
@@ -19,7 +19,7 @@
## $Rev$ $Date$
##
-geronimo.packaging.geronimo_version=1.0-SNAPSHOT
+geronimo.packaging.geronimo_version=1.1-SNAPSHOT
geronimo.packaging.srcDir=${basedir}/src/plan
geronimo.packaging.planFile=plan.xml
Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml?rev=368307&r1=368306&r2=368307&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml Thu Jan 12 00:09:02 2006
@@ -22,7 +22,7 @@
<groupId>geronimo</groupId>
<id>geronimo-packaging-plugin</id>
<name>Geronimo :: Maven Packaging Plugin</name>
- <currentVersion>1.1.1</currentVersion>
+ <currentVersion>1.1.2</currentVersion>
<dependencies>
<dependency>