Author: ammulder
Date: Sun Dec 5 10:21:47 2004
New Revision: 109898
URL: http://svn.apache.org/viewcvs?view=rev&rev=109898
Log:
Move deployment exceptions into common module, so they are available to
the command-line deployer as well as the server deployment code.
Update imports and module dependencies accordingly
Added:
geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/AmbiguousEJBRefException.java
- copied, changed from r109883,
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AmbiguousEJBRefException.java
geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/DeploymentException.java
- copied, changed from r109883,
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentException.java
geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/UnknownEJBRefException.java
- copied, changed from r109883,
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnknownEJBRefException.java
geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/UnresolvedEJBRefException.java
- copied, changed from r109883,
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnresolvedEJBRefException.java
Removed:
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentException.java
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AmbiguousEJBRefException.java
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnknownEJBRefException.java
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnresolvedEJBRefException.java
Modified:
geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGeronimoUtils.java
geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java
geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilderTest.java
geronimo/trunk/modules/deploy-tool/project.xml
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/AbstractCommand.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListModules.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListTargets.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandPackage.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployCommand.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployUtils.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeploymentSyntaxException.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/ServerConnection.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/util/DeploymentHelper.java
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ResourceReferenceBuilder.java
geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java
geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
geronimo/trunk/modules/naming-builder/project.xml
geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanHelper.java
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
geronimo/trunk/modules/tomcat/project.xml
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Modified:
geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGeronimoUtils.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGeronimoUtils.java?view=diff&rev=109898&p1=geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGeronimoUtils.java&r1=109897&p2=geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGeronimoUtils.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGeronimoUtils.java
(original)
+++
geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGeronimoUtils.java
Sun Dec 5 10:21:47 2004
@@ -49,7 +49,7 @@
import org.apache.axis.utils.NetworkUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.jmx.GBeanMBean;
import org.apache.geronimo.kernel.Kernel;
Modified:
geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java?view=diff&rev=109898&p1=geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java&r1=109897&p2=geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java
(original)
+++
geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java
Sun Dec 5 10:21:47 2004
@@ -27,7 +27,7 @@
import javax.management.ObjectName;
import org.apache.geronimo.deployment.ConfigurationBuilder;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
Modified:
geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?view=diff&rev=109898&p1=geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java&r1=109897&p2=geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
(original)
+++
geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
Sun Dec 5 10:21:47 2004
@@ -34,7 +34,7 @@
import javax.management.ObjectName;
import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.service.GBeanHelper;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.deployment.util.NestedJarFile;
Copied:
geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/AmbiguousEJBRefException.java
(from r109883,
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AmbiguousEJBRefException.java)
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/AmbiguousEJBRefException.java?view=diff&rev=109898&p1=geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AmbiguousEJBRefException.java&r1=109883&p2=geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/AmbiguousEJBRefException.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AmbiguousEJBRefException.java
(original)
+++
geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/AmbiguousEJBRefException.java
Sun Dec 5 10:21:47 2004
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.j2ee.deployment;
-
-import org.apache.geronimo.deployment.DeploymentException;
+package org.apache.geronimo.common;
/**
* @version $Rev$ $Date$
Copied:
geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/DeploymentException.java
(from r109883,
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentException.java)
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/DeploymentException.java?view=diff&rev=109898&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentException.java&r1=109883&p2=geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/DeploymentException.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentException.java
(original)
+++
geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/DeploymentException.java
Sun Dec 5 10:21:47 2004
@@ -15,9 +15,7 @@
* limitations under the License.
*/
-package org.apache.geronimo.deployment;
-
-
+package org.apache.geronimo.common;
/**
Copied:
geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/UnknownEJBRefException.java
(from r109883,
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnknownEJBRefException.java)
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/UnknownEJBRefException.java?view=diff&rev=109898&p1=geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnknownEJBRefException.java&r1=109883&p2=geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/UnknownEJBRefException.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnknownEJBRefException.java
(original)
+++
geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/UnknownEJBRefException.java
Sun Dec 5 10:21:47 2004
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.j2ee.deployment;
-
-import org.apache.geronimo.deployment.DeploymentException;
+package org.apache.geronimo.common;
/**
* @version $Rev$ $Date$
Copied:
geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/UnresolvedEJBRefException.java
(from r109883,
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnresolvedEJBRefException.java)
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/UnresolvedEJBRefException.java?view=diff&rev=109898&p1=geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnresolvedEJBRefException.java&r1=109883&p2=geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/UnresolvedEJBRefException.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnresolvedEJBRefException.java
(original)
+++
geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/UnresolvedEJBRefException.java
Sun Dec 5 10:21:47 2004
@@ -14,32 +14,50 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.j2ee.deployment;
-
-import org.apache.geronimo.deployment.DeploymentException;
+package org.apache.geronimo.common;
/**
* @version $Rev: 46019 $ $Date: 2004-09-14 02:56:06 -0700 (Tue, 14 Sep 2004) $
*/
public class UnresolvedEJBRefException extends DeploymentException {
private final String refName;
- private final EJBRefInfo ejbRefInfo;
-
- public UnresolvedEJBRefException(String refName, EJBRefInfo ejbRefInfo,
boolean foundMultiple) {
- super(createMessage(refName, ejbRefInfo, foundMultiple));
+ private final boolean local;
+ private final boolean session;
+ private final String homeInterface;
+ private final String beanInterface;
+
+ public UnresolvedEJBRefException(String refName, boolean local, boolean
session, String homeInterface,
+ String beanInterface, boolean
foundMultiple) {
+ super(createMessage(refName, local, session, homeInterface,
beanInterface, foundMultiple));
this.refName = refName;
- this.ejbRefInfo = ejbRefInfo;
+ this.local = local;
+ this.session = session;
+ this.homeInterface = homeInterface;
+ this.beanInterface = beanInterface;
}
public String getRefName() {
return refName;
}
- public EJBRefInfo getEjbRefInfo() {
- return ejbRefInfo;
+ public boolean isLocal() {
+ return local;
+ }
+
+ public boolean isSession() {
+ return session;
+ }
+
+ public String getHomeInterface() {
+ return homeInterface;
+ }
+
+ public String getBeanInterface() {
+ return beanInterface;
}
- private static String createMessage(String refName, EJBRefInfo ejbRefInfo,
boolean foundMultiple) {
+ private static String createMessage(String refName, boolean local, boolean
session, String homeInterface,
+ String beanInterface, boolean
foundMultiple) {
StringBuffer msg = new StringBuffer();
if (foundMultiple) {
msg.append("Two or more EJBs were found");
@@ -47,12 +65,12 @@
msg.append("Could not find an EJB");
}
msg.append(" for reference ").append(refName).append(" to a ");
- msg.append((ejbRefInfo.isLocal() ? "local " : "remote "));
- msg.append((ejbRefInfo.isSession() ? "session " : "entity "));
+ msg.append((local ? "local " : "remote "));
+ msg.append((session ? "session " : "entity "));
- msg.append(" bean that has the home interface
").append(ejbRefInfo.getHomeIntf());
- msg.append(" and the ").append(ejbRefInfo.isLocal() ? "local" :
"remote");
- msg.append(" interface ").append(ejbRefInfo.getBeanIntf());
+ msg.append(" bean that has the home interface ").append(homeInterface);
+ msg.append(" and the ").append(local ? "local" : "remote");
+ msg.append(" interface ").append(beanInterface);
return msg.toString();
}
Modified:
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?view=diff&rev=109898&p1=geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java&r1=109897&p2=geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
(original)
+++
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
Sun Dec 5 10:21:47 2004
@@ -52,7 +52,7 @@
import
org.apache.geronimo.connector.outbound.connectionmanagerconfig.TransactionSupport;
import
org.apache.geronimo.connector.outbound.connectionmanagerconfig.XATransactions;
import org.apache.geronimo.connector.outbound.security.PasswordCredentialRealm;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.service.GBeanHelper;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.gbean.DynamicGAttributeInfo;
Modified:
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilderTest.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilderTest.java?view=diff&rev=109898&p1=geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilderTest.java&r1=109897&p2=geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilderTest.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilderTest.java
(original)
+++
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilderTest.java
Sun Dec 5 10:21:47 2004
@@ -37,7 +37,7 @@
import javax.sql.DataSource;
import junit.framework.TestCase;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.jmx.GBeanMBean;
Modified: geronimo/trunk/modules/deploy-tool/project.xml
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/project.xml?view=diff&rev=109898&p1=geronimo/trunk/modules/deploy-tool/project.xml&r1=109897&p2=geronimo/trunk/modules/deploy-tool/project.xml&r2=109898
==============================================================================
--- geronimo/trunk/modules/deploy-tool/project.xml (original)
+++ geronimo/trunk/modules/deploy-tool/project.xml Sun Dec 5 10:21:47 2004
@@ -75,6 +75,12 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-common</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
Modified:
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/AbstractCommand.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/AbstractCommand.java?view=diff&rev=109898&p1=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/AbstractCommand.java&r1=109897&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/AbstractCommand.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/AbstractCommand.java
(original)
+++
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/AbstractCommand.java
Sun Dec 5 10:21:47 2004
@@ -17,7 +17,7 @@
package org.apache.geronimo.deployment.cli;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import javax.enterprise.deploy.spi.status.ProgressObject;
import javax.enterprise.deploy.spi.TargetModuleID;
Modified:
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java?view=diff&rev=109898&p1=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java&r1=109897&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java
(original)
+++
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java
Sun Dec 5 10:21:47 2004
@@ -17,7 +17,7 @@
package org.apache.geronimo.deployment.cli;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import javax.enterprise.deploy.spi.status.ProgressObject;
import javax.enterprise.deploy.spi.DeploymentManager;
Modified:
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java?view=diff&rev=109898&p1=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java&r1=109897&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java
(original)
+++
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java
Sun Dec 5 10:21:47 2004
@@ -28,7 +28,7 @@
import javax.enterprise.deploy.spi.TargetModuleID;
import javax.enterprise.deploy.spi.status.ProgressObject;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
/**
* The CLI deployer logic to distribute.
Modified:
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListModules.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListModules.java?view=diff&rev=109898&p1=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListModules.java&r1=109897&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListModules.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListModules.java
(original)
+++
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListModules.java
Sun Dec 5 10:21:47 2004
@@ -17,7 +17,7 @@
package org.apache.geronimo.deployment.cli;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import javax.enterprise.deploy.spi.TargetModuleID;
import javax.enterprise.deploy.spi.Target;
Modified:
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListTargets.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListTargets.java?view=diff&rev=109898&p1=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListTargets.java&r1=109897&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListTargets.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListTargets.java
(original)
+++
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListTargets.java
Sun Dec 5 10:21:47 2004
@@ -17,7 +17,7 @@
package org.apache.geronimo.deployment.cli;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import java.io.PrintWriter;
import javax.enterprise.deploy.spi.Target;
Modified:
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandPackage.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandPackage.java?view=diff&rev=109898&p1=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandPackage.java&r1=109897&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandPackage.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandPackage.java
(original)
+++
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandPackage.java
Sun Dec 5 10:21:47 2004
@@ -17,7 +17,7 @@
package org.apache.geronimo.deployment.cli;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import java.io.PrintWriter;
import java.io.File;
Modified:
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java?view=diff&rev=109898&p1=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java&r1=109897&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java
(original)
+++
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java
Sun Dec 5 10:21:47 2004
@@ -17,7 +17,7 @@
package org.apache.geronimo.deployment.cli;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import java.io.PrintWriter;
import java.io.File;
Modified:
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java?view=diff&rev=109898&p1=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java&r1=109897&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java
(original)
+++
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java
Sun Dec 5 10:21:47 2004
@@ -17,7 +17,7 @@
package org.apache.geronimo.deployment.cli;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import java.io.PrintWriter;
import java.util.ArrayList;
Modified:
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployCommand.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployCommand.java?view=diff&rev=109898&p1=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployCommand.java&r1=109897&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployCommand.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployCommand.java
(original)
+++
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployCommand.java
Sun Dec 5 10:21:47 2004
@@ -17,7 +17,7 @@
package org.apache.geronimo.deployment.cli;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import java.io.PrintWriter;
Modified:
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java?view=diff&rev=109898&p1=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java&r1=109897&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java
(original)
+++
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java
Sun Dec 5 10:21:47 2004
@@ -17,7 +17,7 @@
package org.apache.geronimo.deployment.cli;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import java.util.*;
import java.io.PrintWriter;
Modified:
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployUtils.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployUtils.java?view=diff&rev=109898&p1=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployUtils.java&r1=109897&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployUtils.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployUtils.java
(original)
+++
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployUtils.java
Sun Dec 5 10:21:47 2004
@@ -19,7 +19,7 @@
import java.io.*;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
/**
*
Modified:
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeploymentSyntaxException.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeploymentSyntaxException.java?view=diff&rev=109898&p1=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeploymentSyntaxException.java&r1=109897&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeploymentSyntaxException.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeploymentSyntaxException.java
(original)
+++
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeploymentSyntaxException.java
Sun Dec 5 10:21:47 2004
@@ -17,7 +17,7 @@
package org.apache.geronimo.deployment.cli;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
/**
* Something was wrong with the user's syntax (as opposed to the command
Modified:
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/ServerConnection.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/ServerConnection.java?view=diff&rev=109898&p1=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/ServerConnection.java&r1=109897&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/ServerConnection.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/ServerConnection.java
(original)
+++
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/ServerConnection.java
Sun Dec 5 10:21:47 2004
@@ -31,7 +31,7 @@
import javax.enterprise.deploy.spi.factories.DeploymentFactory;
import javax.management.ObjectName;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import
org.apache.geronimo.deployment.plugin.factories.AuthenticationFailedException;
import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl;
import org.apache.geronimo.system.main.CommandLine;
Modified:
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java?view=diff&rev=109898&p1=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java&r1=109897&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java
(original)
+++
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java
Sun Dec 5 10:21:47 2004
@@ -30,7 +30,7 @@
import javax.enterprise.deploy.spi.TargetModuleID;
import javax.management.ObjectName;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.plugin.TargetModuleIDImpl;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.kernel.KernelMBean;
Modified:
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java?view=diff&rev=109898&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java&r1=109897&p2=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java
(original)
+++
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java
Sun Dec 5 10:21:47 2004
@@ -21,6 +21,7 @@
import java.io.IOException;
import java.util.List;
import java.util.jar.JarFile;
+import org.apache.geronimo.common.DeploymentException;
/**
* @version $Rev$ $Date$
@@ -32,7 +33,7 @@
* @param planFile the deployment plan to examine; can be null
* @param module the URL of the module to examine; can be null
* @return the deployment plan, or null if this builder can not handle the
module
- * @throws DeploymentException if there was a problem with the
configuration
+ * @throws org.apache.geronimo.common.DeploymentException if there was a
problem with the configuration
*/
Object getDeploymentPlan(File planFile, JarFile module) throws
DeploymentException;
@@ -43,7 +44,7 @@
* @param module the module to build
* @param outfile the file to write the configuration to
* @throws IOException if there was a problem reading or writing the files
- * @throws DeploymentException if there was a problem with the
configuration
+ * @throws org.apache.geronimo.common.DeploymentException if there was a
problem with the configuration
*/
List buildConfiguration(Object plan, JarFile module, File outfile) throws
IOException, DeploymentException;
}
Modified:
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java?view=diff&rev=109898&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java&r1=109897&p2=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
(original)
+++
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
Sun Dec 5 10:21:47 2004
@@ -40,6 +40,7 @@
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.kernel.config.ConfigurationStore;
import org.apache.geronimo.kernel.config.InvalidConfigException;
+import org.apache.geronimo.common.DeploymentException;
/**
* Command line based deployment utility which combines multiple deployable
modules
Modified:
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java?view=diff&rev=109898&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java&r1=109897&p2=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
(original)
+++
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
Sun Dec 5 10:21:47 2004
@@ -58,6 +58,7 @@
import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.config.ConfigurationManager;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
+import org.apache.geronimo.common.DeploymentException;
/**
* @version $Rev$ $Date$
Deleted:
/geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentException.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentException.java?view=auto&rev=109897
==============================================================================
Modified:
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/util/DeploymentHelper.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/util/DeploymentHelper.java?view=diff&rev=109898&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/util/DeploymentHelper.java&r1=109897&p2=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/util/DeploymentHelper.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/util/DeploymentHelper.java
(original)
+++
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/util/DeploymentHelper.java
Sun Dec 5 10:21:47 2004
@@ -23,7 +23,7 @@
import javax.xml.parsers.DocumentBuilder;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
@@ -43,7 +43,7 @@
* Create an helper related to the specified deployment URL with META-INF
* as the directory with the given files
*
- * @see #DeploymentHelper(URLInfo, String, String, String, String)
+ * @see #DeploymentHelper(URLInfo, String, String, String)
*/
public DeploymentHelper(URLInfo urlInfo, String j2eeDDName,
String geronimoDDName) throws DeploymentException {
Deleted:
/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AmbiguousEJBRefException.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AmbiguousEJBRefException.java?view=auto&rev=109897
==============================================================================
Modified:
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?view=diff&rev=109898&p1=geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java&r1=109897&p2=geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
(original)
+++
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Sun Dec 5 10:21:47 2004
@@ -37,8 +37,8 @@
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.ConfigurationBuilder;
-import org.apache.geronimo.deployment.DeploymentException;
import org.apache.geronimo.deployment.service.GBeanHelper;
import org.apache.geronimo.deployment.util.NestedJarFile;
import org.apache.geronimo.deployment.util.DeploymentUtil;
Modified:
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java?view=diff&rev=109898&p1=geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java&r1=109897&p2=geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java
(original)
+++
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java
Sun Dec 5 10:21:47 2004
@@ -22,7 +22,7 @@
import javax.management.ObjectName;
import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
Modified:
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java?view=diff&rev=109898&p1=geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java&r1=109897&p2=geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java
(original)
+++
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java
Sun Dec 5 10:21:47 2004
@@ -18,7 +18,7 @@
import javax.naming.Reference;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
/**
* @version $Rev$ $Date$
Modified:
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java?view=diff&rev=109898&p1=geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java&r1=109897&p2=geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
(original)
+++
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
Sun Dec 5 10:21:47 2004
@@ -21,7 +21,7 @@
import java.net.URI;
import java.util.jar.JarFile;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
/**
* @version $Rev$ $Date$
Modified:
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java?view=diff&rev=109898&p1=geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java&r1=109897&p2=geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java
(original)
+++
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java
Sun Dec 5 10:21:47 2004
@@ -25,7 +25,10 @@
import javax.management.ObjectName;
import javax.naming.Reference;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.common.AmbiguousEJBRefException;
+import org.apache.geronimo.common.UnknownEJBRefException;
+import org.apache.geronimo.common.UnresolvedEJBRefException;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.gbean.GBeanData;
@@ -330,7 +333,7 @@
// if we didn't find any ejbs that implement that interface... give up
if (references == null || references.isEmpty()) {
- throw new UnresolvedEJBRefException(refName, ejbRefInfo, false);
+ throw new UnresolvedEJBRefException(refName, ejbRefInfo.isLocal(),
ejbRefInfo.isSession(), ejbRefInfo.getHomeIntf(), ejbRefInfo.getBeanIntf(),
false);
}
// if there is only one matching ejb, use it
@@ -345,7 +348,7 @@
}
// there is more then one ejb that implements that interface... give up
- throw new UnresolvedEJBRefException(refName, ejbRefInfo, true);
+ throw new UnresolvedEJBRefException(refName, ejbRefInfo.isLocal(),
ejbRefInfo.isSession(), ejbRefInfo.getHomeIntf(), ejbRefInfo.getBeanIntf(),
true);
}
//Resource adapter/activationspec support
Modified:
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ResourceReferenceBuilder.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ResourceReferenceBuilder.java?view=diff&rev=109898&p1=geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ResourceReferenceBuilder.java&r1=109897&p2=geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ResourceReferenceBuilder.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ResourceReferenceBuilder.java
(original)
+++
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ResourceReferenceBuilder.java
Sun Dec 5 10:21:47 2004
@@ -18,7 +18,7 @@
import javax.naming.Reference;
import javax.management.ObjectName;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.gbean.GBeanData;
/**
Deleted:
/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnknownEJBRefException.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnknownEJBRefException.java?view=auto&rev=109897
==============================================================================
Deleted:
/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnresolvedEJBRefException.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnresolvedEJBRefException.java?view=auto&rev=109897
==============================================================================
Modified:
geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java?view=diff&rev=109898&p1=geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java&r1=109897&p2=geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
(original)
+++
geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
Sun Dec 5 10:21:47 2004
@@ -26,7 +26,7 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.kernel.jmx.JMXUtil;
Modified:
geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java?view=diff&rev=109898&p1=geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java&r1=109897&p2=geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java
(original)
+++
geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java
Sun Dec 5 10:21:47 2004
@@ -21,7 +21,10 @@
import javax.management.ObjectName;
import junit.framework.TestCase;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.common.AmbiguousEJBRefException;
+import org.apache.geronimo.common.UnknownEJBRefException;
+import org.apache.geronimo.common.UnresolvedEJBRefException;
import org.apache.geronimo.gbean.GBeanData;
/**
Modified:
geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java?view=diff&rev=109898&p1=geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java&r1=109897&p2=geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
(original)
+++
geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
Sun Dec 5 10:21:47 2004
@@ -22,7 +22,7 @@
import java.util.jar.JarFile;
import junit.framework.Assert;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
/**
* @version $Rev$ $Date$
Modified:
geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java?view=diff&rev=109898&p1=geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java&r1=109897&p2=geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
(original)
+++
geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
Sun Dec 5 10:21:47 2004
@@ -22,7 +22,7 @@
import java.util.jar.JarFile;
import junit.framework.Assert;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
/**
* @version $Rev$ $Date$
Modified:
geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java?view=diff&rev=109898&p1=geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java&r1=109897&p2=geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
(original)
+++
geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
Sun Dec 5 10:21:47 2004
@@ -24,7 +24,7 @@
import javax.management.ObjectName;
import junit.framework.Assert;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
/**
* @version $Rev$ $Date$
Modified:
geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?view=diff&rev=109898&p1=geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java&r1=109897&p2=geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
(original)
+++
geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
Sun Dec 5 10:21:47 2004
@@ -37,7 +37,7 @@
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.service.GBeanHelper;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.gbean.GBeanInfo;
Modified: geronimo/trunk/modules/naming-builder/project.xml
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming-builder/project.xml?view=diff&rev=109898&p1=geronimo/trunk/modules/naming-builder/project.xml&r1=109897&p2=geronimo/trunk/modules/naming-builder/project.xml&r2=109898
==============================================================================
--- geronimo/trunk/modules/naming-builder/project.xml (original)
+++ geronimo/trunk/modules/naming-builder/project.xml Sun Dec 5 10:21:47 2004
@@ -58,6 +58,12 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-common</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
Modified:
geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java?view=diff&rev=109898&p1=geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java&r1=109897&p2=geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
(original)
+++
geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
Sun Dec 5 10:21:47 2004
@@ -30,7 +30,7 @@
import javax.naming.Reference;
import javax.transaction.UserTransaction;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.RefContext;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
Modified:
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java?view=diff&rev=109898&p1=geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java&r1=109897&p2=geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
(original)
+++
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
Sun Dec 5 10:21:47 2004
@@ -24,7 +24,7 @@
import javax.management.ObjectName;
import org.apache.geronimo.common.propertyeditor.PropertyEditors;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GAttributeInfo;
Modified:
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanHelper.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanHelper.java?view=diff&rev=109898&p1=geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanHelper.java&r1=109897&p2=geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanHelper.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanHelper.java
(original)
+++
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanHelper.java
Sun Dec 5 10:21:47 2004
@@ -17,8 +17,8 @@
package org.apache.geronimo.deployment.service;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.deployment.DeploymentException;
/**
*
Modified:
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java?view=diff&rev=109898&p1=geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java&r1=109897&p2=geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
(original)
+++
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
Sun Dec 5 10:21:47 2004
@@ -30,9 +30,9 @@
import java.util.jar.JarFile;
import javax.management.MalformedObjectNameException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.ConfigurationBuilder;
import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.deployment.DeploymentException;
import org.apache.geronimo.deployment.xbeans.ConfigurationDocument;
import org.apache.geronimo.deployment.xbeans.ConfigurationType;
import org.apache.geronimo.deployment.xbeans.DependencyType;
Modified: geronimo/trunk/modules/tomcat/project.xml
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/project.xml?view=diff&rev=109898&p1=geronimo/trunk/modules/tomcat/project.xml&r1=109897&p2=geronimo/trunk/modules/tomcat/project.xml&r2=109898
==============================================================================
--- geronimo/trunk/modules/tomcat/project.xml (original)
+++ geronimo/trunk/modules/tomcat/project.xml Sun Dec 5 10:21:47 2004
@@ -49,6 +49,11 @@
<dependencies>
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-common</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-deployment</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
Modified:
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Url:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?view=diff&rev=109898&p1=geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java&r1=109897&p2=geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java&r2=109898
==============================================================================
---
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
(original)
+++
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Sun Dec 5 10:21:47 2004
@@ -34,7 +34,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
