geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r942987 - in /geronimo/server/trunk: framework/configs/ framework/configs/upgrade-cli/ framework/configs/upgrade-cli/src/main/history/ framework/configs/upgrade-cli/src/main/plan/ framework/configs/upgrade/ framework/configs/upgrade/src/mai...
Date Tue, 11 May 2010 02:40:40 GMT
Author: genspring
Date: Tue May 11 02:40:39 2010
New Revision: 942987

URL: http://svn.apache.org/viewvc?rev=942987&view=rev
Log:
GERONIMO-4583 Remove obsolete plugins from plugins group, we don't need to upgrade a  1.0
plan to 1.1 plan anymore.

Removed:
    geronimo/server/trunk/framework/configs/upgrade-cli/pom.xml
    geronimo/server/trunk/framework/configs/upgrade-cli/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/upgrade-cli/src/main/plan/plan.xml
    geronimo/server/trunk/framework/configs/upgrade/pom.xml
    geronimo/server/trunk/framework/configs/upgrade/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/upgrade/src/main/plan/plan.xml
    geronimo/server/trunk/framework/modules/geronimo-upgrade/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/UpgradeGBean.java
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1Test.java
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/appclient_dep_1.xml
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/appclient_dep_1_result.xml
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/appclient_ejb_1.xml
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/appclient_ejb_1_result.xml
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/assembly_1.xml
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/assembly_1_result.xml
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/ejb_pkgen_1.xml
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/gbean_1.xml
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/gbean_1_result.xml
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/servlet_1.xml
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/servlet_1_result.xml
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/transport_1.xml
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/transport_1_result.xml
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/transport_2.xml
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/transport_2_result.xml
Modified:
    geronimo/server/trunk/framework/configs/pom.xml
    geronimo/server/trunk/framework/modules/pom.xml
    geronimo/server/trunk/plugingroups/wab-jetty/pom.xml
    geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml
    geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java

Modified: geronimo/server/trunk/framework/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/pom.xml?rev=942987&r1=942986&r2=942987&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/pom.xml Tue May 11 02:40:39 2010
@@ -46,8 +46,6 @@
         <module>plugin</module>
         <module>server-security-config</module>
         <module>shutdown</module>
-        <module>upgrade-cli</module>
-        <module>upgrade</module>
         <module>jmx-security</module>
         <module>karaf-framework</module>
     </modules>

Modified: geronimo/server/trunk/framework/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/pom.xml?rev=942987&r1=942986&r2=942987&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/pom.xml Tue May 11 02:40:39 2010
@@ -100,7 +100,6 @@
                 <module>geronimo-naming</module>
                 <module>geronimo-security</module>
                 <module>geronimo-transformer</module>
-                <module>geronimo-upgrade</module>
             </modules>
         </profile>
         <profile>

Modified: geronimo/server/trunk/plugingroups/wab-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/wab-jetty/pom.xml?rev=942987&r1=942986&r2=942987&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/wab-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/wab-jetty/pom.xml Tue May 11 02:40:39 2010
@@ -65,12 +65,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>upgrade-cli</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>offline-deployer</artifactId>
             <version>${project.version}</version>
             <type>car</type>

Modified: geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml?rev=942987&r1=942986&r2=942987&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml Tue May 11 02:40:39 2010
@@ -65,12 +65,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>upgrade-cli</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>offline-deployer</artifactId>
             <version>${project.version}</version>
             <type>car</type>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml?rev=942987&r1=942986&r2=942987&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml Tue May 11 02:40:39 2010
@@ -55,13 +55,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-upgrade</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security-builder</artifactId>
             <version>${project.version}</version>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java?rev=942987&r1=942986&r2=942987&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
Tue May 11 02:40:39 2010
@@ -51,7 +51,6 @@ import org.apache.geronimo.deployment.pl
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.util.XmlUtil;
-import org.apache.geronimo.upgrade.Upgrade1_0To1_1;
 import org.w3c.dom.Document;
 
 /**
@@ -180,31 +179,6 @@ public class DeploymentPortlet extends B
                     abbrStatusMessage = getLocalizedString(actionRequest, "plugin.errorMsg01");
                     addErrorMessage(actionRequest, abbrStatusMessage, fullStatusMessage);
                     log.error(abbrStatusMessage + "\n" + fullStatusMessage);
-                    // try to provide an upgraded version of the plan
-                    try {
-                        if (planFile != null && planFile.exists()) {
-                            byte[] plan = new byte[(int) planFile.length()];
-                            fis = new FileInputStream(planFile);
-                            fis.read(plan);
-                            DocumentBuilder documentBuilder = XmlUtil.newDocumentBuilderFactory().newDocumentBuilder();
-                            Document doc = documentBuilder.parse(new ByteArrayInputStream(plan));
-                            // v1.1 switched from configId to moduleId
-                            String configId = doc.getDocumentElement().getAttribute("configId");
-                            if (configId != null && !("".equals(configId))) {
-                                StringWriter sw = new StringWriter();
-                                new Upgrade1_0To1_1().upgrade(new ByteArrayInputStream(plan),
sw);
-                                // have to store the original and upgraded plans in the session
-                                // because the buffer size for render parameters is sometimes
not
-                                // big enough
-                                actionRequest.getPortletSession().setAttribute(MIGRATED_PLAN_PARM,
sw.getBuffer());
-                                actionRequest.getPortletSession().setAttribute(ORIGINAL_PLAN_PARM,
new String(plan));
-                            }
-                        }
-                    } catch (Exception e) {
-                        // cannot provide a migrated plan in this case, most likely
-                        // because the deployment plan would not parse. a valid
-                        // status message has already been provided in this case
-                    }
                 }
             } finally {
                 mgr.release();



Mime
View raw message