You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/08/04 20:36:15 UTC
svn commit: r428837 - in
/geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/src: ./
java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java
java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
Author: jdillon
Date: Fri Aug 4 11:36:15 2006
New Revision: 428837
URL: http://svn.apache.org/viewvc?rev=428837&view=rev
Log:
r639@jason-dillons-computer (orig r428809): jdillon | 2006-08-04 11:15:28 -0700
r635@jason-dillons-computer (orig r428535): ammulder | 2006-08-03 14:36:04 -0700
Merge fixes for GERONIMO-2269 and GERONIMO-2270 to trunk.
May want to rethink these as part of subsequent refactoring efforts,
but better to not have the bugs for now.
Modified:
geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/src/ (props changed)
geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java
geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
Propchange: geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/src/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Aug 4 11:36:15 2006
@@ -1 +1 @@
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/deploy-jsr88/src:428000
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/deploy-jsr88/src:428809
Modified: geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java?rev=428837&r1=428836&r2=428837&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java Fri Aug 4 11:36:15 2006
@@ -16,32 +16,29 @@
*/
package org.apache.geronimo.deployment.plugin;
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
import java.io.BufferedReader;
+import java.io.File;
import java.io.FileReader;
+import java.io.IOException;
import java.io.InputStreamReader;
-import java.io.DataInputStream;
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
-import java.util.jar.JarFile;
-import java.util.jar.JarEntry;
-import java.util.Stack;
+import java.io.Reader;
import java.util.Collection;
-import java.util.List;
import java.util.LinkedList;
-import javax.xml.parsers.SAXParserFactory;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.ParserConfigurationException;
+import java.util.List;
+import java.util.Stack;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
import javax.enterprise.deploy.spi.TargetModuleID;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.common.FileUtils;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.repository.Version;
+import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import org.xml.sax.Attributes;
import org.xml.sax.helpers.DefaultHandler;
/**
@@ -98,7 +95,7 @@
return name;
}
} else {
- if(!isJarFile(module)) {
+ if(!FileUtils.isZipFile(module)) {
throw new DeploymentException(module.getAbsolutePath()+" is neither a JAR file nor a directory!");
}
JarFile input = new JarFile(module);
@@ -250,8 +247,12 @@
private String inElement = null;
private Stack parent = new Stack();
private boolean formatIs10 = false;
+ private String defaultType;
public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+ if(defaultType == null && uri != null && !uri.equals("")) {
+ setDefaultType(uri);
+ }
if(inConfigId) {
if(localName.equals("groupId") || localName.equals("artifactId") || localName.equals("version") || localName.equals("type")) {
inElement = localName;
@@ -269,6 +270,22 @@
parent.push(localName);
}
+ private void setDefaultType(String namespace) {
+ if(namespace.indexOf("web") > -1) {
+ defaultType = "war";
+ } else if(namespace.indexOf("openejb") > -1) {
+ defaultType = "jar";
+ } else if(namespace.indexOf("connector") > -1) {
+ defaultType = "rar";
+ } else if(namespace.indexOf("application-client") > -1) {
+ defaultType = "jar";
+ } else if(namespace.indexOf("application") > -1) {
+ defaultType = "ear";
+ } else {
+ defaultType = "car";
+ }
+ }
+
public void characters(char ch[], int start, int length) throws SAXException {
if(inElement != null) {
formatIs10 = false;
@@ -293,6 +310,9 @@
public void endDocument() throws SAXException {
if(!formatIs10) {
+ if(type.equals("") && defaultType != null) {
+ type = defaultType;
+ }
configId = groupId+"/"+artifactId+"/"+version+"/"+type;
}
if(configId.equals("///")) {
Modified: geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java?rev=428837&r1=428836&r2=428837&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java Fri Aug 4 11:36:15 2006
@@ -169,6 +169,9 @@
}
private void redeploySameConfiguration(ConfigurationManager configurationManager, Artifact configID, Target target) throws Exception {
+ if(!configID.isResolved()) {
+ throw new IllegalStateException("Cannot redeploy same module when module ID is not fully resolved ("+configID+")");
+ }
try {
configurationManager.stopConfiguration(configID);
updateStatus("Stopped "+configID);