You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2010/05/06 12:35:32 UTC
svn commit: r941646 - in
/geronimo/server/branches/2.1/plugins/console/plugin-portlets: pom.xml
src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
Author: genspring
Date: Thu May 6 10:35:31 2010
New Revision: 941646
URL: http://svn.apache.org/viewvc?rev=941646&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.
Modified:
geronimo/server/branches/2.1/plugins/console/plugin-portlets/pom.xml
geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/pom.xml?rev=941646&r1=941645&r2=941646&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/pom.xml Thu May 6 10:35:31 2010
@@ -58,13 +58,6 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-upgrade</artifactId>
- <version>${version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security-builder</artifactId>
<version>${version}</version>
Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java?rev=941646&r1=941645&r2=941646&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java Thu May 6 10:35:31 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;
/**
@@ -185,32 +184,6 @@ public class DeploymentPortlet extends B
abbrStatusMessage = getLocalizedString(actionRequest, "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();