You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/12/06 02:13:58 UTC
svn commit: r482859 - in /geronimo/server/branches/1.2/modules:
geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/
geronimo-deploy-jsr88/
geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/
geronimo-d...
Author: djencks
Date: Tue Dec 5 17:13:56 2006
New Revision: 482859
URL: http://svn.apache.org/viewvc?view=rev&rev=482859
Log:
GERONIMO-2627 clean up the jsr88 classpath problems a little bit
Added:
geronimo/server/branches/1.2/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/
geronimo/server/branches/1.2/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigBean.java (contents, props changed)
- copied, changed from r482750, geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/client/ClientConfigBean.java
geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/
geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigBean.java (contents, props changed)
- copied, changed from r482750, geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/application/EARConfigBean.java
geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfiguration.java (contents, props changed)
- copied, changed from r482750, geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/application/EARConfiguration.java
geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigurer.java (contents, props changed)
- copied, changed from r482750, geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/application/EARConfigurer.java
Removed:
geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/application/EARConfigBean.java
geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/application/EARConfiguration.java
geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/application/EARConfigurer.java
geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/client/ClientConfigBean.java
Modified:
geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/pom.xml
geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java
geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/AbstractDeployCommand.java
geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java
geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
Copied: geronimo/server/branches/1.2/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigBean.java (from r482750, geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/client/ClientConfigBean.java)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigBean.java?view=diff&rev=482859&p1=geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/client/ClientConfigBean.java&r1=482750&p2=geronimo/server/branches/1.2/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigBean.java&r2=482859
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/client/ClientConfigBean.java (original)
+++ geronimo/server/branches/1.2/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigBean.java Tue Dec 5 17:13:56 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.geronimo.deployment.plugin.client;
+package org.apache.geronimo.client.builder.jsr88;
import javax.enterprise.deploy.model.DDBean;
Propchange: geronimo/server/branches/1.2/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/branches/1.2/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigBean.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/branches/1.2/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigBean.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/pom.xml?view=diff&rev=482859&r1=482858&r2=482859
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/pom.xml (original)
+++ geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/pom.xml Tue Dec 5 17:13:56 2006
@@ -41,26 +41,6 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-deployment</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector-builder</artifactId>
- <version>${version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-web-builder</artifactId>
- <version>${version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
</dependency>
Modified: geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java?view=diff&rev=482859&r1=482858&r2=482859
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java (original)
+++ geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java Tue Dec 5 17:13:56 2006
@@ -17,22 +17,22 @@
package org.apache.geronimo.deployment.plugin;
-import javax.enterprise.deploy.spi.DeploymentManager;
+import java.io.File;
+import java.io.InputStream;
+import java.util.Locale;
+
+import javax.enterprise.deploy.model.DeployableObject;
+import javax.enterprise.deploy.shared.DConfigBeanVersionType;
+import javax.enterprise.deploy.shared.ModuleType;
import javax.enterprise.deploy.spi.DeploymentConfiguration;
+import javax.enterprise.deploy.spi.DeploymentManager;
import javax.enterprise.deploy.spi.Target;
import javax.enterprise.deploy.spi.TargetModuleID;
-import javax.enterprise.deploy.spi.status.ProgressObject;
-import javax.enterprise.deploy.spi.exceptions.InvalidModuleException;
import javax.enterprise.deploy.spi.exceptions.DConfigBeanVersionUnsupportedException;
+import javax.enterprise.deploy.spi.exceptions.InvalidModuleException;
import javax.enterprise.deploy.spi.exceptions.TargetException;
-import javax.enterprise.deploy.model.DeployableObject;
-import javax.enterprise.deploy.shared.DConfigBeanVersionType;
-import javax.enterprise.deploy.shared.ModuleType;
-import java.util.Locale;
-import java.io.File;
-import java.io.InputStream;
-import org.apache.geronimo.connector.deployment.RARConfigurer;
-import org.apache.geronimo.web.deployment.WARConfigurer;
+import javax.enterprise.deploy.spi.status.ProgressObject;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -58,9 +58,9 @@
log.error("Unable to invoke EJB deployer", e);
}
} else if(dObj.getType().equals(ModuleType.RAR)) {
- return new RARConfigurer().createConfiguration(dObj);
+// return new RARConfigurer().createConfiguration(dObj);
} else if(dObj.getType().equals(ModuleType.WAR)) {
- return new WARConfigurer().createConfiguration(dObj); // this is jetty
+// return new WARConfigurer().createConfiguration(dObj); // this is jetty
// todo: Tomcat WARConfigurer
}
throw new InvalidModuleException("Not supported");
Modified: geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java?view=diff&rev=482859&r1=482858&r2=482859
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java (original)
+++ geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java Tue Dec 5 17:13:56 2006
@@ -21,6 +21,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
+
import javax.enterprise.deploy.model.DeployableObject;
import javax.enterprise.deploy.shared.DConfigBeanVersionType;
import javax.enterprise.deploy.shared.ModuleType;
@@ -32,7 +33,10 @@
import javax.enterprise.deploy.spi.exceptions.InvalidModuleException;
import javax.enterprise.deploy.spi.exceptions.TargetException;
import javax.enterprise.deploy.spi.status.ProgressObject;
-import org.apache.geronimo.connector.deployment.RARConfigurer;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+//import org.apache.geronimo.connector.deployment.RARConfigurer;
import org.apache.geronimo.deployment.plugin.TargetImpl;
import org.apache.geronimo.deployment.plugin.TargetModuleIDImpl;
import org.apache.geronimo.deployment.plugin.local.CommandSupport;
@@ -47,11 +51,8 @@
import org.apache.geronimo.kernel.config.ConfigurationManager;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.config.ConfigurationUtil;
-import org.apache.geronimo.kernel.config.NoSuchStoreException;
import org.apache.geronimo.kernel.management.State;
-import org.apache.geronimo.web.deployment.WARConfigurer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+//import org.apache.geronimo.web.deployment.WARConfigurer;
/**
@@ -291,9 +292,9 @@
log.error("Unable to invoke EJB deployer", e);
}
} else if(dObj.getType().equals(ModuleType.RAR)) {
- return new RARConfigurer().createConfiguration(dObj);
+// return new RARConfigurer().createConfiguration(dObj);
} else if(dObj.getType().equals(ModuleType.WAR)) {
- return new WARConfigurer().createConfiguration(dObj);
+// return new WARConfigurer().createConfiguration(dObj);
}
throw new InvalidModuleException("Not supported");
}
Modified: geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/AbstractDeployCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/AbstractDeployCommand.java?view=diff&rev=482859&r1=482858&r2=482859
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/AbstractDeployCommand.java (original)
+++ geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/AbstractDeployCommand.java Tue Dec 5 17:13:56 2006
@@ -30,7 +30,6 @@
import javax.enterprise.deploy.spi.Target;
import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.deployment.Deployer;
import org.apache.geronimo.deployment.plugin.TargetModuleIDImpl;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
@@ -84,6 +83,15 @@
}
return deployer;
+ }
+
+ // be careful to clean up the temp file... we tell the vm to delete this on exit
+ // but VMs can't be trusted to acutally delete the file
+ // Copied from DeploymentUtil
+ protected static File createTempFile() throws IOException {
+ File tempFile = File.createTempFile("geronimo-deploymentUtil", ".tmpdir");
+ tempFile.deleteOnExit();
+ return tempFile;
}
protected void copyTo(File outfile, InputStream is) throws IOException {
Modified: geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java?view=diff&rev=482859&r1=482858&r2=482859
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java (original)
+++ geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java Tue Dec 5 17:13:56 2006
@@ -17,13 +17,13 @@
package org.apache.geronimo.deployment.plugin.local;
-import org.apache.geronimo.deployment.util.DeploymentUtil;
-import org.apache.geronimo.kernel.Kernel;
+import java.io.File;
+import java.io.InputStream;
import javax.enterprise.deploy.shared.CommandType;
import javax.enterprise.deploy.spi.Target;
-import java.io.File;
-import java.io.InputStream;
+
+import org.apache.geronimo.kernel.Kernel;
/**
* @version $Rev$ $Date$
@@ -45,11 +45,11 @@
try {
if (spool) {
if (moduleStream != null) {
- moduleArchive = DeploymentUtil.createTempFile();
+ moduleArchive = createTempFile();
copyTo(moduleArchive, moduleStream);
}
if (deploymentStream != null) {
- deploymentPlan = DeploymentUtil.createTempFile();
+ deploymentPlan = createTempFile();
copyTo(deploymentPlan, deploymentStream);
}
}
Modified: geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java?view=diff&rev=482859&r1=482858&r2=482859
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java (original)
+++ geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java Tue Dec 5 17:13:56 2006
@@ -19,13 +19,14 @@
import java.io.File;
import java.io.InputStream;
import java.util.Iterator;
+
import javax.enterprise.deploy.shared.CommandType;
import javax.enterprise.deploy.spi.Target;
import javax.enterprise.deploy.spi.TargetModuleID;
+
import org.apache.geronimo.deployment.plugin.ConfigIDExtractor;
import org.apache.geronimo.deployment.plugin.TargetImpl;
import org.apache.geronimo.deployment.plugin.TargetModuleIDImpl;
-import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.kernel.InternalKernelException;
import org.apache.geronimo.kernel.Kernel;
@@ -62,11 +63,11 @@
try {
if (spool) {
if (moduleStream != null) {
- moduleArchive = DeploymentUtil.createTempFile();
+ moduleArchive = createTempFile();
copyTo(moduleArchive, moduleStream);
}
if (deploymentStream != null) {
- deploymentPlan = DeploymentUtil.createTempFile();
+ deploymentPlan = createTempFile();
copyTo(deploymentPlan, deploymentStream);
}
}
Copied: geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigBean.java (from r482750, geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/application/EARConfigBean.java)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigBean.java?view=diff&rev=482859&p1=geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/application/EARConfigBean.java&r1=482750&p2=geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigBean.java&r2=482859
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/application/EARConfigBean.java (original)
+++ geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigBean.java Tue Dec 5 17:13:56 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.geronimo.deployment.plugin.application;
+package org.apache.geronimo.j2ee.jsr88;
import javax.enterprise.deploy.model.DDBean;
Propchange: geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigBean.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigBean.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfiguration.java (from r482750, geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/application/EARConfiguration.java)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfiguration.java?view=diff&rev=482859&p1=geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/application/EARConfiguration.java&r1=482750&p2=geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfiguration.java&r2=482859
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/application/EARConfiguration.java (original)
+++ geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfiguration.java Tue Dec 5 17:13:56 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.geronimo.deployment.plugin.application;
+package org.apache.geronimo.j2ee.jsr88;
import javax.enterprise.deploy.model.DeployableObject;
Propchange: geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfiguration.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfiguration.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigurer.java (from r482750, geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/application/EARConfigurer.java)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigurer.java?view=diff&rev=482859&p1=geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/application/EARConfigurer.java&r1=482750&p2=geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigurer.java&r2=482859
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/application/EARConfigurer.java (original)
+++ geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigurer.java Tue Dec 5 17:13:56 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.geronimo.deployment.plugin.application;
+package org.apache.geronimo.j2ee.jsr88;
import javax.enterprise.deploy.model.DeployableObject;
import javax.enterprise.deploy.shared.ModuleType;
@@ -25,6 +25,7 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.j2ee.jsr88.EARConfiguration;
/**
*
Propchange: geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigurer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigurer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigurer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain