You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/08/25 15:39:53 UTC
svn commit: r436788 - in
/geronimo/server/branches/sachin/modules/deployment/src/main/java/org/apache/geronimo/deployment:
DefaultDeployableModule.java DeployableModule.java
DeployableModuleFactory.java
Author: sppatel
Date: Fri Aug 25 06:39:49 2006
New Revision: 436788
URL: http://svn.apache.org/viewvc?rev=436788&view=rev
Log:
remove 2x class
Modified:
geronimo/server/branches/sachin/modules/deployment/src/main/java/org/apache/geronimo/deployment/DefaultDeployableModule.java
geronimo/server/branches/sachin/modules/deployment/src/main/java/org/apache/geronimo/deployment/DeployableModule.java
geronimo/server/branches/sachin/modules/deployment/src/main/java/org/apache/geronimo/deployment/DeployableModuleFactory.java
Modified: geronimo/server/branches/sachin/modules/deployment/src/main/java/org/apache/geronimo/deployment/DefaultDeployableModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/deployment/src/main/java/org/apache/geronimo/deployment/DefaultDeployableModule.java?rev=436788&r1=436787&r2=436788&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/deployment/src/main/java/org/apache/geronimo/deployment/DefaultDeployableModule.java (original)
+++ geronimo/server/branches/sachin/modules/deployment/src/main/java/org/apache/geronimo/deployment/DefaultDeployableModule.java Fri Aug 25 06:39:49 2006
@@ -64,71 +64,4 @@
DeploymentUtil.close(jarFile);
}
-}
-package org.apache.geronimo.deployment;
-
-import org.apache.geronimo.deployment.util.DeploymentUtil;
-import org.apache.geronimo.deployment.util.NestedJarFile;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.jar.JarFile;
-import java.net.URL;
-
-/**
- * @version
- */
-public class DefaultDeployableModule implements DeployableModule {
-
- private String uri;
- private File root;
- private JarFile jarFile;
-
- public DefaultDeployableModule(File root, JarFile jarFile) {
- this.uri = uri;
- this.root = root;
- this.jarFile = jarFile;
- }
-
- public String getURI() {
- return uri;
- }
-
- public File getRoot() {
- return root;
- }
-
- public File[] getModuleContextResources() {
- return null;
- }
-
- public File[] getClassesFolders() {
- return null;
- }
-
- public boolean isArchived() {
- return root.isFile();
- }
-
- public DeployableModule[] getModules() {
- return null;
- }
-
- public URL resolve(String path) throws IOException {
- return DeploymentUtil.createJarURL(jarFile, path);
- }
-
- public DeployableModule resolveModule(String uri) throws IOException {
- JarFile nestedJar = new NestedJarFile(jarFile, uri);
- return DeployableModuleFactory.createDeployableModule(nestedJar);
- }
-
- public JarFile getJarFile() {
- return jarFile;
- }
-
- public void cleanup() {
- DeploymentUtil.close(jarFile);
- }
-
-}
+}
\ No newline at end of file
Modified: geronimo/server/branches/sachin/modules/deployment/src/main/java/org/apache/geronimo/deployment/DeployableModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/deployment/src/main/java/org/apache/geronimo/deployment/DeployableModule.java?rev=436788&r1=436787&r2=436788&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/deployment/src/main/java/org/apache/geronimo/deployment/DeployableModule.java (original)
+++ geronimo/server/branches/sachin/modules/deployment/src/main/java/org/apache/geronimo/deployment/DeployableModule.java Fri Aug 25 06:39:49 2006
@@ -73,88 +73,4 @@
*/
void cleanup();
-}
-package org.apache.geronimo.deployment;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-
-/**
- * @version
- */
-public interface DeployableModule {
-
- /**
- * Returns the uri of the module, foo.ear, if a nested module then
- * foo.ear/foo.war
- *
- * //TODO GERONIMO-1526 Perhaps this should be getName() and use this method instead of getRoot().getName() in builders
- *
- * @return
- */
- String getURI();
-
- /**
- * Returns the root of the module, if isArchived then it return absolute
- * location of the archive, otherwise the root folder of the module.
- *
- * @return
- */
- File getRoot();
-
- /**
- * Returns the root folders for the resources in this module that should be
- * added to the module context. Returns an empty array if this is an
- * archived module.
- *
- * @return a possibly-empty array of resource folders
- */
- File[] getModuleContextResources();
-
- /**
- * returns all the URLs that contain .class files, if isArchive then this
- * would return an empty array
- *
- * @return
- */
- File[] getClassesFolders();
-
- /**
- * Returns true if this is an archived module. The archive can be a JarFile
- * or an exploded archive.
- *
- * @return boolean
- */
- boolean isArchived();
-
- /**
- * Returns all the child modules for this module. For an ear module, this
- * would return all of its contained j2ee modules and utility modules. For a
- * web module, it would return its WEB-INF/lib entries.
- *
- * @return a possibly empty array of modules contained within this module
- */
- DeployableModule[] getModules();
-
- /**
- *
- * @param path
- * @return
- */
- URL resolve(String path) throws IOException;
-
- /**
- *
- * @param uri
- * @return
- * @throws IOException
- */
- DeployableModule resolveModule(String uri) throws IOException;
-
- /**
- * Peforms any cleanup on the instance, for a JarFile, would close it.
- */
- void cleanup();
-
-}
+}
\ No newline at end of file
Modified: geronimo/server/branches/sachin/modules/deployment/src/main/java/org/apache/geronimo/deployment/DeployableModuleFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/deployment/src/main/java/org/apache/geronimo/deployment/DeployableModuleFactory.java?rev=436788&r1=436787&r2=436788&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/deployment/src/main/java/org/apache/geronimo/deployment/DeployableModuleFactory.java (original)
+++ geronimo/server/branches/sachin/modules/deployment/src/main/java/org/apache/geronimo/deployment/DeployableModuleFactory.java Fri Aug 25 06:39:49 2006
@@ -29,36 +29,4 @@
}
return null;
}
-}
-package org.apache.geronimo.deployment;
-
-import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.deployment.util.DeploymentUtil;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.jar.JarFile;
-
-/**
- * @version
- */
-public class DeployableModuleFactory {
-
- public static DeployableModule createDeployableModule(JarFile moduleFile) {
- return new DefaultDeployableModule(null, moduleFile);
- }
-
- public static DeployableModule createDeployableModule(File moduleFile, String deployableModuleImplClass) throws DeploymentException {
- if (deployableModuleImplClass == null) {
- try {
- JarFile jar = DeploymentUtil.createJarFile(moduleFile);
- return new DefaultDeployableModule(moduleFile, jar);
- } catch (IOException e) {
- throw new DeploymentException("Cound not open module file: " + moduleFile.getAbsolutePath(), e);
- }
- } else {
- //TODO
- }
- return null;
- }
-}
+}
\ No newline at end of file