svn commit: r896343 - in /geronimo/server/trunk/framework/modules: geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/ geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/

[xu...@apache.org]

Author: xuhaihong
Date: Wed Jan  6 07:50:25 2010
New Revision: 896343

URL: http://svn.apache.org/viewvc?rev=896343&view=rev
Log:
GERONIMO-5008 Create util methods for all the Geronimo components

Modified:
    geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java
    geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandDistribute.java

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java?rev=896343&r1=896342&r2=896343&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java Wed Jan  6 07:50:25 2010
@@ -28,14 +28,16 @@
 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.apache.geronimo.kernel.util.JarUtils;
 import org.apache.geronimo.kernel.util.XmlUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -100,7 +102,7 @@
                 return name;
             }
         } else {
-            if(!FileUtils.isZipFile(module)) {
+            if(!JarUtils.isZipFile(module)) {
                 throw new DeploymentException(module.getAbsolutePath()+" is neither a JAR file nor a directory!");
             }
             JarFile input = new JarFile(module);

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandDistribute.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandDistribute.java?rev=896343&r1=896342&r2=896343&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandDistribute.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandDistribute.java Wed Jan  6 07:50:25 2010
@@ -31,7 +31,6 @@
 import org.apache.geronimo.cli.deployer.CommandArgs;
 import org.apache.geronimo.cli.deployer.DistributeCommandArgs;
 import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.common.FileUtils;
 import org.apache.geronimo.deployment.plugin.jmx.JMXDeploymentManager;
 import org.apache.geronimo.kernel.util.JarUtils;
 
@@ -82,7 +81,7 @@
         if (args.length > 0) {
             File test = new File(args[0]);
             try {
-                if (FileUtils.isJarFile(test) || test.isDirectory()) {
+                if (JarUtils.isJarFile(test) || test.isDirectory()) {
                     if (module != null) {
                         throw new DeploymentSyntaxException("Module and plan cannot both be JAR files or directories!");
                     }