Author: dblevins
Date: Thu Mar 3 01:26:52 2011
New Revision: 1076484
URL: http://svn.apache.org/viewvc?rev=1076484&view=rev
Log:
Add toString() to the DeploymentModule impls for easier debugging..
Normalize jndi reference names to contain "java:comp/env" if they don't already
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConnectorModule.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceModule.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java?rev=1076484&r1=1076483&r2=1076484&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
Thu Mar 3 01:26:52 2011
@@ -240,4 +240,12 @@ public class AppModule implements Deploy
modules.addAll(clientModules);
return modules;
}
+
+
+ @Override
+ public String toString() {
+ return "AppModule{" +
+ "moduleId='" + moduleId + '\'' +
+ '}';
+ }
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java?rev=1076484&r1=1076483&r2=1076484&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java
Thu Mar 3 01:26:52 2011
@@ -140,4 +140,12 @@ public class ClientModule implements Dep
public Set<String> getWatchedResources() {
return watchedResources;
}
+
+ @Override
+ public String toString() {
+ return "ClientModule{" +
+ "moduleId='" + moduleId + '\'' +
+ ", mainClass='" + mainClass + '\'' +
+ '}';
+ }
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConnectorModule.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConnectorModule.java?rev=1076484&r1=1076483&r2=1076484&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConnectorModule.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConnectorModule.java
Thu Mar 3 01:26:52 2011
@@ -114,4 +114,11 @@ public class ConnectorModule implements
public Set<String> getWatchedResources() {
return watchedResources;
}
+
+ @Override
+ public String toString() {
+ return "ConnectorModule{" +
+ "moduleId='" + moduleId + '\'' +
+ '}';
+ }
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java?rev=1076484&r1=1076483&r2=1076484&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
Thu Mar 3 01:26:52 2011
@@ -189,4 +189,11 @@ public class EjbModule implements WsModu
public Set<String> getWatchedResources() {
return watchedResources;
}
+
+ @Override
+ public String toString() {
+ return "EjbModule{" +
+ "moduleId='" + moduleId + '\'' +
+ '}';
+ }
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceModule.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceModule.java?rev=1076484&r1=1076483&r2=1076484&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceModule.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceModule.java
Thu Mar 3 01:26:52 2011
@@ -71,4 +71,11 @@ public class PersistenceModule implement
public ValidationContext getValidation() {
return null;
}
+
+ @Override
+ public String toString() {
+ return "PersistenceModule{" +
+ "rootUrl='" + rootUrl + '\'' +
+ '}';
+ }
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java?rev=1076484&r1=1076483&r2=1076484&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
Thu Mar 3 01:26:52 2011
@@ -258,6 +258,7 @@ public class SunConversion implements Dy
for (EjbRef ref : sunApplicationClient.getEjbRef()) {
if (ref.getJndiName() != null) {
String refName = ref.getEjbRefName();
+ refName = normalize(refName);
org.apache.openejb.jee.EjbRef ejbRef = refMap.get(refName);
if (ejbRef == null) {
ejbRef = new org.apache.openejb.jee.EjbRef();
@@ -277,6 +278,7 @@ public class SunConversion implements Dy
for (ResourceRef ref : sunApplicationClient.getResourceRef()) {
if (ref.getJndiName() != null) {
String refName = ref.getResRefName();
+ refName = normalize(refName);
JndiReference resEnvRef = resEnvMap.get(refName);
if (resEnvRef != null) {
resEnvRef.setMappedName(ref.getJndiName());
@@ -286,6 +288,7 @@ public class SunConversion implements Dy
for (ResourceEnvRef ref : sunApplicationClient.getResourceEnvRef()) {
if (ref.getJndiName() != null) {
String refName = ref.getResourceEnvRefName();
+ refName = normalize(refName);
JndiReference resEnvRef = resEnvMap.get(refName);
if (resEnvRef != null) {
resEnvRef.setMappedName(ref.getJndiName());
@@ -295,6 +298,7 @@ public class SunConversion implements Dy
for (MessageDestinationRef ref :
sunApplicationClient.getMessageDestinationRef()) {
if (ref.getJndiName() != null) {
String refName = ref.getMessageDestinationRefName();
+ refName = normalize(refName);
JndiReference resEnvRef = resEnvMap.get(refName);
if (resEnvRef != null) {
resEnvRef.setMappedName(ref.getJndiName());
@@ -305,6 +309,7 @@ public class SunConversion implements Dy
Map<String, ServiceRef> serviceRefMap =
applicationClient.getServiceRefMap();
for (org.apache.openejb.jee.sun.ServiceRef ref :
sunApplicationClient.getServiceRef()) {
String refName = ref.getServiceRefName();
+ refName = normalize(refName);
ServiceRef serviceRef = serviceRefMap.get(refName);
if (serviceRef != null) {
Map<String,PortComponentRef> ports = new
TreeMap<String,PortComponentRef>();
@@ -337,6 +342,11 @@ public class SunConversion implements Dy
}
}
+ private String normalize(String refName) {
+ if (!refName.startsWith("java:")) refName = "java:comp/env/" + refName;
+ return refName;
+ }
+
public void convertModule(WebModule webModule) {
if (webModule == null) {
return;
@@ -384,6 +394,7 @@ public class SunConversion implements Dy
for (ResourceRef ref : sunWebApp.getResourceRef()) {
if (ref.getJndiName() != null) {
String refName = ref.getResRefName();
+ refName = normalize(refName);
JndiReference resEnvRef = resEnvMap.get(refName);
if (resEnvRef != null) {
resEnvRef.setMappedName(ref.getJndiName());
@@ -393,6 +404,7 @@ public class SunConversion implements Dy
for (ResourceEnvRef ref : sunWebApp.getResourceEnvRef()) {
if (ref.getJndiName() != null) {
String refName = ref.getResourceEnvRefName();
+ refName = normalize(refName);
JndiReference resEnvRef = resEnvMap.get(refName);
if (resEnvRef != null) {
resEnvRef.setMappedName(ref.getJndiName());
@@ -402,6 +414,7 @@ public class SunConversion implements Dy
for (MessageDestinationRef ref : sunWebApp.getMessageDestinationRef())
{
if (ref.getJndiName() != null) {
String refName = ref.getMessageDestinationRefName();
+ refName = normalize(refName);
JndiReference resEnvRef = resEnvMap.get(refName);
if (resEnvRef != null) {
resEnvRef.setMappedName(ref.getJndiName());
@@ -412,6 +425,7 @@ public class SunConversion implements Dy
Map<String, ServiceRef> serviceRefMap = webApp.getServiceRefMap();
for (org.apache.openejb.jee.sun.ServiceRef ref :
sunWebApp.getServiceRef()) {
String refName = ref.getServiceRefName();
+ refName = normalize(refName);
ServiceRef serviceRef = serviceRefMap.get(refName);
if (serviceRef != null) {
Map<String,PortComponentRef> ports = new
TreeMap<String,PortComponentRef>();
@@ -533,6 +547,7 @@ public class SunConversion implements Dy
for (EjbRef ref : ejb.getEjbRef()) {
if (ref.getJndiName() != null) {
String refName = ref.getEjbRefName();
+ refName = normalize(refName);
EjbLink link = linksMap.get(refName);
if (link == null) {
link = new EjbLink();
@@ -548,6 +563,7 @@ public class SunConversion implements Dy
for (ResourceRef ref : ejb.getResourceRef()) {
if (ref.getJndiName() != null) {
String refName = ref.getResRefName();
+ refName = normalize(refName);
ResourceLink link = resourceLinksMap.get(refName);
if (link == null) {
link = new ResourceLink();
@@ -562,6 +578,7 @@ public class SunConversion implements Dy
for (ResourceEnvRef ref : ejb.getResourceEnvRef()) {
if (ref.getJndiName() != null) {
String refName = ref.getResourceEnvRefName();
+ refName = normalize(refName);
ResourceLink link = resourceLinksMap.get(refName);
if (link == null) {
link = new ResourceLink();
@@ -576,6 +593,7 @@ public class SunConversion implements Dy
for (MessageDestinationRef ref : ejb.getMessageDestinationRef()) {
if (ref.getJndiName() != null) {
String refName = ref.getMessageDestinationRefName();
+ refName = normalize(refName);
ResourceLink link = resourceLinksMap.get(refName);
if (link == null) {
link = new ResourceLink();
@@ -592,6 +610,7 @@ public class SunConversion implements Dy
Map<String, ServiceRef> serviceRefMap =
bean.getServiceRefMap();
for (org.apache.openejb.jee.sun.ServiceRef ref :
ejb.getServiceRef()) {
String refName = ref.getServiceRefName();
+ refName = normalize(refName);
ServiceRef serviceRef = serviceRefMap.get(refName);
if (serviceRef != null) {
Map<String,PortComponentRef> ports = new
TreeMap<String,PortComponentRef>();
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java?rev=1076484&r1=1076483&r2=1076484&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java
Thu Mar 3 01:26:52 2011
@@ -184,4 +184,12 @@ public class WebModule implements WsModu
public List<FacesConfig> getFacesConfigs() {
return facesConfigs;
}
+
+ @Override
+ public String toString() {
+ return "WebModule{" +
+ "moduleId='" + moduleId + '\'' +
+ ", contextRoot='" + contextRoot + '\'' +
+ '}';
+ }
}
