geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r355335 [2/2] - in /geronimo/branches/1.0: ./ applications/console-core/src/java/org/apache/geronimo/console/util/ applications/console-standard/ applications/console-standard/src/java/org/apache/geronimo/console/configmanager/ applications...
Date Fri, 09 Dec 2005 03:11:47 GMT
Modified: geronimo/branches/1.0/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java
(original)
+++ geronimo/branches/1.0/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java
Thu Dec  8 19:11:29 2005
@@ -69,6 +69,7 @@
         boolean multiple = isMultipleTargets(ids);
         ProgressObject po = runCommand(out, mgr, ids);
         TargetModuleID[] done = po.getResultTargetModuleIDs();
+        out.println();
         for(int i = 0; i < done.length; i++) {
             TargetModuleID id = done[i];
             out.print(DeployUtils.reformat(getAction()+" "+id.getModuleID()+(multiple ? "
on "+id.getTarget().getName() : "")+(id.getWebURL() == null || !getAction().equals("Started")
? "" : " @ "+id.getWebURL()),4, 72));

Modified: geronimo/branches/1.0/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
(original)
+++ geronimo/branches/1.0/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
Thu Dec  8 19:11:29 2005
@@ -17,6 +17,26 @@
 
 package org.apache.geronimo.deployment;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.deployment.util.DeploymentUtil;
+import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.kernel.GBeanNotFoundException;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.config.Configuration;
+import org.apache.geronimo.kernel.config.ConfigurationData;
+import org.apache.geronimo.kernel.config.ConfigurationManager;
+import org.apache.geronimo.kernel.config.ConfigurationModuleType;
+import org.apache.geronimo.kernel.config.ConfigurationUtil;
+import org.apache.geronimo.kernel.config.InvalidConfigException;
+import org.apache.geronimo.kernel.config.MultiParentClassLoader;
+import org.apache.geronimo.kernel.config.NoSuchConfigException;
+import org.apache.geronimo.kernel.management.State;
+import org.apache.geronimo.kernel.repository.Repository;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -30,40 +50,20 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.StringTokenizer;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.HashSet;
-import java.util.Map;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
-import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.deployment.util.DeploymentUtil;
-import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.kernel.GBeanNotFoundException;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.config.Configuration;
-import org.apache.geronimo.kernel.config.ConfigurationData;
-import org.apache.geronimo.kernel.config.ConfigurationManager;
-import org.apache.geronimo.kernel.config.ConfigurationModuleType;
-import org.apache.geronimo.kernel.config.ConfigurationUtil;
-import org.apache.geronimo.kernel.config.InvalidConfigException;
-import org.apache.geronimo.kernel.config.MultiParentClassLoader;
-import org.apache.geronimo.kernel.config.NoSuchConfigException;
-import org.apache.geronimo.kernel.management.State;
-import org.apache.geronimo.kernel.repository.Repository;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * @version $Rev$ $Date$
@@ -646,10 +646,12 @@
                 Collections.reverse(loadedAncestors);
                 for (Iterator iterator = loadedAncestors.iterator(); iterator.hasNext();)
{
                     URI configID = (URI) iterator.next();
-                    try {
-                        configurationManager.unload(configID);
-                    } catch (NoSuchConfigException e) {
-                        throw new DeploymentException("Could not find a configuration we
previously loaded! " + configID, e);
+                    if(configurationManager.isLoaded(configID)) {
+                        try {
+                            configurationManager.unload(configID);
+                        } catch (NoSuchConfigException e) {
+                            throw new DeploymentException("Could not find a configuration
we previously loaded! " + configID, e);
+                        }
                     }
                 }
                 loadedAncestors.clear();

Modified: geronimo/branches/1.0/modules/derby/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/derby/project.xml?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/derby/project.xml (original)
+++ geronimo/branches/1.0/modules/derby/project.xml Thu Dec  8 19:11:29 2005
@@ -51,6 +51,11 @@
             <artifactId>geronimo-system</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-management</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.derby</groupId>

Modified: geronimo/branches/1.0/modules/derby/src/java/org/apache/geronimo/derby/DerbySystem.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/derby/src/java/org/apache/geronimo/derby/DerbySystem.java?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/derby/src/java/org/apache/geronimo/derby/DerbySystem.java
(original)
+++ geronimo/branches/1.0/modules/derby/src/java/org/apache/geronimo/derby/DerbySystem.java
Thu Dec  8 19:11:29 2005
@@ -18,7 +18,10 @@
 package org.apache.geronimo.derby;
 
 /**
+ * Management interface for the Derby system GBean
+ *
  * @version $Rev$ $Date$
  */
 public interface DerbySystem {
+    public String getDerbyHome();
 }

Modified: geronimo/branches/1.0/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java
(original)
+++ geronimo/branches/1.0/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java
Thu Dec  8 19:11:29 2005
@@ -17,9 +17,6 @@
 
 package org.apache.geronimo.derby;
 
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
@@ -27,6 +24,9 @@
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
 /**
  * A GBean that represents an instance of an Apache Derby system (a system being
  * a collection of different databases).
@@ -40,15 +40,20 @@
 
     private final ServerInfo serverInfo;
     private final String systemHome;
+    private String actualHome;
 
     public DerbySystemGBean(ServerInfo serverInfo, String derbySystemHome) {
         this.serverInfo = serverInfo;
         this.systemHome = derbySystemHome;
     }
 
+    public String getDerbyHome() {
+        return actualHome;
+    }
+
     public void doStart() throws Exception {
         // set up the system property for the database home
-        String actualHome = System.getProperty(SYSTEM_HOME);
+        actualHome = System.getProperty(SYSTEM_HOME);
         if (actualHome == null) {
             actualHome = serverInfo.resolvePath(systemHome);
         }
@@ -92,6 +97,7 @@
     static {
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(DerbySystemGBean.class);
         infoFactory.addAttribute("derbySystemHome", String.class, true);
+        infoFactory.addAttribute("derbyHome", String.class, false);
         infoFactory.addReference("ServerInfo", ServerInfo.class, "GBean");
         infoFactory.setConstructor(new String[]{"ServerInfo", "derbySystemHome"});
         GBEAN_INFO = infoFactory.getBeanInfo();

Modified: geronimo/branches/1.0/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManager.java?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManager.java
(original)
+++ geronimo/branches/1.0/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManager.java
Thu Dec  8 19:11:29 2005
@@ -16,11 +16,10 @@
  */
 package org.apache.geronimo.kernel.config;
 
+import javax.management.ObjectName;
 import java.io.IOException;
 import java.net.URI;
 import java.util.List;
-import java.util.Collection;
-import javax.management.ObjectName;
 
 /**
  * Encapsulates logic for dealing with configurations.
@@ -63,10 +62,12 @@
 
     /**
      * Load the specified configuration and all parent configurations into the kernel. This
does not
-     * start any configuration gbeans or load any gbeans from the configurations loaded.
+     * start any configuration gbeans or load any gbeans from the configurations loaded.
 It does
+     * not hurt to call this even if some or all of the GBeans are already loaded -- though
only
+     * configurations actually loaded by this call will be returned.
      *
      * @param configID the id of the configuration
-     * @return a list of names of configurations loaded into the kernel
+     * @return a list of URIs (names of configurations that were actually loaded)
      * @throws NoSuchConfigException if no configuration with the given id exists in the
configuration stores
      * @throws IOException if there is a problem loading te configuration from the store
      * @throws InvalidConfigException if the configuration is corrupt

Modified: geronimo/branches/1.0/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManagerImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManagerImpl.java?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManagerImpl.java
(original)
+++ geronimo/branches/1.0/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManagerImpl.java
Thu Dec  8 19:11:29 2005
@@ -17,17 +17,6 @@
 
 package org.apache.geronimo.kernel.config;
 
-import java.io.IOException;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
@@ -36,8 +25,19 @@
 import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.InternalKernelException;
 import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.management.State;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
+import org.apache.geronimo.kernel.management.State;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
 
 /**
  * The standard non-editable ConfigurationManager implementation.  That is,
@@ -168,6 +168,16 @@
     public List loadRecursive(URI configID) throws NoSuchConfigException, IOException, InvalidConfigException
{
         LinkedList ancestors = new LinkedList();
         Set preloaded = kernel.listGBeans(CONFIGURATION_NAME_QUERY);
+        for (Iterator it = preloaded.iterator(); it.hasNext();) {
+            ObjectName name = (ObjectName) it.next();
+            try {
+                if(kernel.getGBeanState(name) != State.RUNNING_INDEX) {
+                    it.remove();
+                }
+            } catch (GBeanNotFoundException e) {
+                it.remove();
+            }
+        }
         loadRecursive(configID, ancestors, preloaded);
         return ancestors;
     }

Modified: geronimo/branches/1.0/modules/management/src/java/org/apache/geronimo/management/geronimo/WebAccessLog.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/management/src/java/org/apache/geronimo/management/geronimo/WebAccessLog.java?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/management/src/java/org/apache/geronimo/management/geronimo/WebAccessLog.java
(original)
+++ geronimo/branches/1.0/modules/management/src/java/org/apache/geronimo/management/geronimo/WebAccessLog.java
Thu Dec  8 19:11:29 2005
@@ -16,7 +16,6 @@
  */
 package org.apache.geronimo.management.geronimo;
 
-import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -24,13 +23,7 @@
  *
  * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
  */
-public interface WebAccessLog {
-    /**
-     * The most search lines that will ever be returned, no matter what you
-     * ask for.  This is to conserve memory and transfer bandwidth.
-     */
-    public final static int MAX_SEARCH_RESULTS = 1000;
-
+public interface WebAccessLog extends Log {
     /**
      * Gets the name of all logs used by this system.  Typically there
      * is only one, but specialized cases may use more.
@@ -62,45 +55,4 @@
                                    String uri, Date startDate, Date endDate,
                                    Integer skipResults, Integer maxResults);
 
-    public static class LogMessage implements Serializable {
-        private final int lineNumber;
-        private final String lineContent;
-
-        public LogMessage(int lineNumber, String lineContent) {
-            this.lineNumber = lineNumber;
-            this.lineContent = lineContent;
-        }
-
-        public int getLineNumber() {
-            return lineNumber;
-        }
-
-        public String getLineContent() {
-            return lineContent;
-        }
-    }
-
-    public static class SearchResults implements Serializable {
-        private final int lineCount; // total lines in log file
-        private final LogMessage[] results;
-        private final boolean capped; // whether there were more matched than are returned
here
-
-        public SearchResults(int lineCount, LogMessage[] results, boolean capped) {
-            this.lineCount = lineCount;
-            this.results = results;
-            this.capped = capped;
-        }
-
-        public int getLineCount() {
-            return lineCount;
-        }
-
-        public LogMessage[] getResults() {
-            return results;
-        }
-
-        public boolean isCapped() {
-            return capped;
-        }
-    }
 }

Modified: geronimo/branches/1.0/modules/tomcat/src/plan/tomcat-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/tomcat/src/plan/tomcat-plan.xml?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/tomcat/src/plan/tomcat-plan.xml (original)
+++ geronimo/branches/1.0/modules/tomcat/src/plan/tomcat-plan.xml Thu Dec  8 19:11:29 2005
@@ -28,10 +28,10 @@
     >
 
     <dependency>
-        <uri>geronimo/jars/geronimo-tomcat-1.0-SNAPSHOT.jar</uri>
+        <uri>geronimo/jars/geronimo-tomcat-1.0.jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-system-1.0-SNAPSHOT.jar</uri>
+        <uri>geronimo/jars/geronimo-system-1.0.jar</uri>
     </dependency>
     <dependency>
         <uri>geronimo-spec/jars/geronimo-spec-j2ee-1.4-rc3.jar</uri>

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=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.properties Thu Dec  8 19:11:29
2005
@@ -22,7 +22,7 @@
 maven.compile.source=1.4
 maven.compile.target=1.4
 
-geronimoVersion=1.0-SNAPSHOT
+geronimoVersion=1.0
 
 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=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.xml (original)
+++ geronimo/branches/1.0/plugins/geronimo-assembly-plugin/project.xml Thu Dec  8 19:11:29
2005
@@ -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-SNAPSHOT</currentVersion>
+    <currentVersion>1.0</currentVersion>
 
     <dependencies>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0</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=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.properties Thu Dec  8
19:11:29 2005
@@ -22,7 +22,7 @@
 maven.compile.source=1.4
 maven.compile.target=1.4
 
-geronimoVersion=1.0-SNAPSHOT
+geronimoVersion=1.0
 
 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=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.xml (original)
+++ geronimo/branches/1.0/plugins/geronimo-dependency-plugin/project.xml Thu Dec  8 19:11:29
2005
@@ -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-SNAPSHOT</currentVersion>
+    <currentVersion>1.0</currentVersion>
 
     <dependencies>
         <dependency>

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=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-deployment-plugin/plugin.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-deployment-plugin/plugin.properties Thu Dec  8
19:11:29 2005
@@ -21,5 +21,5 @@
 
 geronimoGroupId=geronimo
 geronimoArtifactId=geronimo
-geronimoVersion=1.0-SNAPSHOT
+geronimoVersion=1.0
 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=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-deployment-plugin/project.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-deployment-plugin/project.properties Thu Dec  8
19:11:29 2005
@@ -29,4 +29,4 @@
 
 maven.multiproject.type=plugin
 
-geronimo_version=1.0-SNAPSHOT
+geronimo_version=1.0

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=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.properties Thu Dec  8 19:11:29
2005
@@ -23,7 +23,7 @@
 maven.compile.source=1.4
 maven.compile.target=1.4
 
-geronimoVersion=1.0-SNAPSHOT
+geronimoVersion=1.0
 
 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=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.xml (original)
+++ geronimo/branches/1.0/plugins/geronimo-izpack-plugin/project.xml Thu Dec  8 19:11:29 2005
@@ -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-SNAPSHOT</currentVersion>
+    <currentVersion>1.0</currentVersion>
 
     <dependencies>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0</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=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-packaging-plugin/plugin.properties (original)
+++ geronimo/branches/1.0/plugins/geronimo-packaging-plugin/plugin.properties Thu Dec  8 19:11:29
2005
@@ -19,7 +19,7 @@
 ## $Rev$ $Date$
 ##
 
-geronimo.packaging.geronimo_version=1.0-SNAPSHOT
+geronimo.packaging.geronimo_version=1.0
 
 geronimo.packaging.srcDir=${basedir}/src/plan
 geronimo.packaging.planFile=plan.xml

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=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.xml (original)
+++ geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.xml Thu Dec  8 19:11:29
2005
@@ -22,13 +22,13 @@
     <groupId>geronimo</groupId>
     <id>geronimo-packaging-plugin</id>
     <name>Geronimo :: Maven Packaging Plugin</name>
-    <currentVersion>1.0-SNAPSHOT</currentVersion>
+    <currentVersion>1.0</currentVersion>
 
     <dependencies>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0</version>
             <properties>
                 <packaging.classpath>true</packaging.classpath>
             </properties>
@@ -97,7 +97,7 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-service-builder</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>xmlbeans</groupId>

Modified: geronimo/branches/1.0/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/pom.xml?rev=355335&r1=355334&r2=355335&view=diff
==============================================================================
--- geronimo/branches/1.0/pom.xml (original)
+++ geronimo/branches/1.0/pom.xml Thu Dec  8 19:11:29 2005
@@ -24,7 +24,7 @@
   <artifactId>geronimo</artifactId>
   <packaging>pom</packaging>
   <name>Geronimo</name>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0</version>
   <description>Geronimo parent</description>
   <url>http://geronimo.apache.org</url>
 
@@ -103,7 +103,7 @@
      | Geronimo module versions
      |
      -->
-    <geronimoVersion>1.0-SNAPSHOT</geronimoVersion>
+    <geronimoVersion>1.0</geronimoVersion>
     
     <!--
      |
@@ -161,7 +161,7 @@
     <dom4jVersion>1.4</dom4jVersion>
     <dwrVersion>1.0</dwrVersion>
     <eclipseCompilerVersion>3.0.1</eclipseCompilerVersion>
-    <geronimoVersion>1.0-SNAPSHOT</geronimoVersion>
+    <geronimoVersion>1.0</geronimoVersion>
     <howlVersion>0.1.11</howlVersion>
     <hsqldbVersion>1.7.2.2</hsqldbVersion>
     <jasperVersion>5.5.9</jasperVersion>
@@ -180,7 +180,7 @@
     <minaVersion>0.7.3</minaVersion>
     <mockobjectsVersion>0.09</mockobjectsVersion>
     <mx4jVersion>3.0.1</mx4jVersion>
-    <openejbVersion>2.0-SNAPSHOT</openejbVersion>
+    <openejbVersion>2.0</openejbVersion>
     <oroVersion>2.0.8</oroVersion>
     <p2psocketsVersion>1.1.2</p2psocketsVersion>
     <plutoVersion>1.0.1</plutoVersion>



Mime
View raw message