jboynes 2003/09/05 13:44:24
Modified:
modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/appclient
ApplicationClient.java
modules/core/src/java/org/apache/geronimo/naming/java
ComponentContextBuilder.java
modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/ejb
Ejb.java
modules/core/src/java/org/apache/geronimo/enterprise/deploy/provider/jar
EjbConverter.java
modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/j2ee
EjbLocalRef.java EjbRef.java
JNDIEnvironmentRefs.java
modules/core/src/java/org/apache/geronimo/xml/deployment
GeronimoAppClientLoader.java
GeronimoJ2EELoader.java
Log:
Fix problem with case-sensitive filename
Revision Changes Path
1.2 +8 -8
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/appclient/ApplicationClient.java
Index: ApplicationClient.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/appclient/ApplicationClient.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApplicationClient.java 5 Sep 2003 20:18:03 -0000 1.1
+++ ApplicationClient.java 5 Sep 2003 20:44:24 -0000 1.2
@@ -55,8 +55,8 @@
*/
package org.apache.geronimo.deployment.model.geronimo.appclient;
-import org.apache.geronimo.deployment.model.geronimo.j2ee.EJBLocalRef;
-import org.apache.geronimo.deployment.model.geronimo.j2ee.EJBRef;
+import org.apache.geronimo.deployment.model.geronimo.j2ee.EjbLocalRef;
+import org.apache.geronimo.deployment.model.geronimo.j2ee.EjbRef;
import org.apache.geronimo.deployment.model.j2ee.EnvEntry;
import
org.apache.geronimo.deployment.model.geronimo.j2ee.MessageDestinationRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.ResourceEnvRef;
@@ -75,7 +75,7 @@
public class ApplicationClient extends Displayable implements
JNDIEnvironmentRefs {
private String version;
private EnvEntry[] envEntry;
- private EJBRef[] ejbRef;
+ private EjbRef[] ejbRef;
private ServiceRef[] serviceRef;
private ResourceRef[] resourceRef;
private ResourceEnvRef[] resourceEnvRef;
@@ -99,16 +99,16 @@
this.callbackHandler = callbackHandler;
}
- public EJBRef[] getEJBRef() {
+ public EjbRef[] getEJBRef() {
return ejbRef;
}
- public void setEJBRef(EJBRef[] ejbRef) {
+ public void setEJBRef(EjbRef[] ejbRef) {
this.ejbRef = ejbRef;
}
- public EJBLocalRef[] getEJBLocalRef() {
- return new EJBLocalRef[0];
+ public EjbLocalRef[] getEJBLocalRef() {
+ return new EjbLocalRef[0];
}
public EnvEntry[] getEnvEntry() {
1.4 +4 -4
incubator-geronimo/modules/core/src/java/org/apache/geronimo/naming/java/ComponentContextBuilder.java
Index: ComponentContextBuilder.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/naming/java/ComponentContextBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ComponentContextBuilder.java 5 Sep 2003 20:18:03 -0000 1.3
+++ ComponentContextBuilder.java 5 Sep 2003 20:44:24 -0000 1.4
@@ -61,7 +61,7 @@
import javax.naming.LinkRef;
import org.apache.geronimo.deployment.DeploymentException;
-import org.apache.geronimo.deployment.model.geronimo.j2ee.EJBRef;
+import org.apache.geronimo.deployment.model.geronimo.j2ee.EjbRef;
import
org.apache.geronimo.deployment.model.geronimo.j2ee.JNDIEnvironmentRefs;
import org.apache.geronimo.deployment.model.j2ee.EnvEntry;
@@ -127,9 +127,9 @@
}
}
- private static void buildEJBRefs(Map envMap, EJBRef[] ejbRefs) {
+ private static void buildEJBRefs(Map envMap, EjbRef[] ejbRefs) {
for (int i = 0; i < ejbRefs.length; i++) {
- EJBRef ejbRef = ejbRefs[i];
+ EjbRef ejbRef = ejbRefs[i];
String name = ejbRef.getEJBRefName();
String jndiName = ejbRef.getJndiName();
LinkRef ref = new LinkRef(jndiName);
1.3 +9 -9
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/ejb/Ejb.java
Index: Ejb.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/ejb/Ejb.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Ejb.java 5 Sep 2003 20:18:03 -0000 1.2
+++ Ejb.java 5 Sep 2003 20:44:24 -0000 1.3
@@ -56,8 +56,8 @@
package org.apache.geronimo.deployment.model.geronimo.ejb;
import org.apache.geronimo.deployment.model.j2ee.EnvEntry;
-import org.apache.geronimo.deployment.model.geronimo.j2ee.EJBLocalRef;
-import org.apache.geronimo.deployment.model.geronimo.j2ee.EJBRef;
+import org.apache.geronimo.deployment.model.geronimo.j2ee.EjbLocalRef;
+import org.apache.geronimo.deployment.model.geronimo.j2ee.EjbRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.ResourceRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.ResourceEnvRef;
import
org.apache.geronimo.deployment.model.geronimo.j2ee.MessageDestinationRef;
@@ -71,8 +71,8 @@
public class Ejb {
private String ejbName;
private EnvEntry[] envEntry = new EnvEntry[0];
- private EJBLocalRef[] ejbLocalRef = new EJBLocalRef[0];
- private EJBRef[] ejbRef = new EJBRef[0];
+ private EjbLocalRef[] ejbLocalRef = new EjbLocalRef[0];
+ private EjbRef[] ejbRef = new EjbRef[0];
private MessageDestinationRef[] messageDestinationRef = new
MessageDestinationRef[0];
private ResourceRef[] resourceRef = new ResourceRef[0];
private ResourceEnvRef[] resourceEnvRef = new ResourceEnvRef[0];
@@ -86,19 +86,19 @@
this.ejbName = ejbName;
}
- public EJBLocalRef[] getEjbLocalRef() {
+ public EjbLocalRef[] getEjbLocalRef() {
return ejbLocalRef;
}
- public void setEjbLocalRef(EJBLocalRef[] ejbLocalRef) {
+ public void setEjbLocalRef(EjbLocalRef[] ejbLocalRef) {
this.ejbLocalRef = ejbLocalRef;
}
- public EJBRef[] getEjbRef() {
+ public EjbRef[] getEjbRef() {
return ejbRef;
}
- public void setEjbRef(EJBRef[] ejbRef) {
+ public void setEjbRef(EjbRef[] ejbRef) {
this.ejbRef = ejbRef;
}
1.5 +9 -9
incubator-geronimo/modules/core/src/java/org/apache/geronimo/enterprise/deploy/provider/jar/EjbConverter.java
Index: EjbConverter.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/enterprise/deploy/provider/jar/EjbConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EjbConverter.java 5 Sep 2003 20:18:03 -0000 1.4
+++ EjbConverter.java 5 Sep 2003 20:44:24 -0000 1.5
@@ -72,9 +72,9 @@
import org.apache.geronimo.deployment.model.geronimo.ejb.Entity;
import org.apache.geronimo.deployment.model.geronimo.ejb.Session;
import org.apache.geronimo.deployment.model.j2ee.EnvEntry;
-import org.apache.geronimo.deployment.model.geronimo.j2ee.EJBRef;
+import org.apache.geronimo.deployment.model.geronimo.j2ee.EjbRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.JndiContextParam;
-import org.apache.geronimo.deployment.model.geronimo.j2ee.EJBLocalRef;
+import org.apache.geronimo.deployment.model.geronimo.j2ee.EjbLocalRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.ResourceRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.ResourceEnvRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.SecurityRoleRef;
@@ -179,7 +179,7 @@
while(it.hasNext()) {
EjbRefBean bean = (EjbRefBean)it.next();
if(isValid(bean.getJndiName())) {
- EJBRef ref = new EJBRef();
+ EjbRef ref = new EjbRef();
ref.setEJBRefName(bean.getEjbRefName());
ref.setJndiName(bean.getJndiName());
ContextParam[] params = bean.getContextParam();
@@ -198,7 +198,7 @@
outer.add(ref);
}
}
- dest.setEjbRef((EJBRef[])outer.toArray(new EJBRef[outer.size()]));
+ dest.setEjbRef((EjbRef[])outer.toArray(new EjbRef[outer.size()]));
}
private static void storeEjbLocalRefs(Ejb dest, Iterator it) {
@@ -206,7 +206,7 @@
while(it.hasNext()) {
EjbLocalRefBean bean = (EjbLocalRefBean)it.next();
if(isValid(bean.getJndiName())) {
- EJBLocalRef ref = new EJBLocalRef();
+ EjbLocalRef ref = new EjbLocalRef();
ref.setEJBRefName(bean.getEjbRefName());
ref.setJndiName(bean.getJndiName());
ContextParam[] params = bean.getContextParam();
@@ -225,7 +225,7 @@
outer.add(ref);
}
}
- dest.setEjbLocalRef((EJBLocalRef[])outer.toArray(new
EJBLocalRef[outer.size()]));
+ dest.setEjbLocalRef((EjbLocalRef[])outer.toArray(new
EjbLocalRef[outer.size()]));
}
private static void storeResourceRefs(Ejb dest, Iterator it) {
@@ -432,7 +432,7 @@
}
}
- private static void assignEjbRefs(BaseEjbBean dest, EJBRef[] refs,
DDBean[] beans) throws ConfigurationException {
+ private static void assignEjbRefs(BaseEjbBean dest, EjbRef[] refs,
DDBean[] beans) throws ConfigurationException {
Set found = new HashSet();
for(int i=0; i<refs.length; i++) {
DDBean match = null;
@@ -468,7 +468,7 @@
}
}
- private static void assignEjbLocalRefs(BaseEjbBean dest, EJBLocalRef[]
refs, DDBean[] beans) throws ConfigurationException {
+ private static void assignEjbLocalRefs(BaseEjbBean dest, EjbLocalRef[]
refs, DDBean[] beans) throws ConfigurationException {
Set found = new HashSet();
for(int i=0; i<refs.length; i++) {
DDBean match = null;
1.3 +2 -2
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/j2ee/EjbLocalRef.java
Index: EjbLocalRef.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/j2ee/EjbLocalRef.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EjbLocalRef.java 5 Sep 2003 20:18:03 -0000 1.2
+++ EjbLocalRef.java 5 Sep 2003 20:44:24 -0000 1.3
@@ -60,7 +60,7 @@
*
* @version $Revision$ $Date$
*/
-public class EJBLocalRef extends
org.apache.geronimo.deployment.model.j2ee.EJBLocalRef {
+public class EjbLocalRef extends
org.apache.geronimo.deployment.model.j2ee.EJBLocalRef {
private String jndiName;
private JndiContextParam[] jndiContextParam;
1.3 +2 -2
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/j2ee/EjbRef.java
Index: EjbRef.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/j2ee/EjbRef.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EjbRef.java 5 Sep 2003 20:18:03 -0000 1.2
+++ EjbRef.java 5 Sep 2003 20:44:24 -0000 1.3
@@ -60,7 +60,7 @@
*
* @version $Revision$ $Date$
*/
-public class EJBRef extends org.apache.geronimo.deployment.model.j2ee.EJBRef
{
+public class EjbRef extends org.apache.geronimo.deployment.model.j2ee.EJBRef
{
private String jndiName;
private JndiContextParam[] jndiContextParam;
1.2 +3 -3
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/j2ee/JNDIEnvironmentRefs.java
Index: JNDIEnvironmentRefs.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/j2ee/JNDIEnvironmentRefs.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JNDIEnvironmentRefs.java 5 Sep 2003 20:18:03 -0000 1.1
+++ JNDIEnvironmentRefs.java 5 Sep 2003 20:44:24 -0000 1.2
@@ -64,9 +64,9 @@
public interface JNDIEnvironmentRefs {
EnvEntry[] getEnvEntry();
- EJBRef[] getEJBRef();
+ EjbRef[] getEJBRef();
- EJBLocalRef[] getEJBLocalRef();
+ EjbLocalRef[] getEJBLocalRef();
ServiceRef[] getServiceRef();
1.2 +3 -3
incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/GeronimoAppClientLoader.java
Index: GeronimoAppClientLoader.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/GeronimoAppClientLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GeronimoAppClientLoader.java 5 Sep 2003 20:18:03 -0000 1.1
+++ GeronimoAppClientLoader.java 5 Sep 2003 20:44:24 -0000 1.2
@@ -56,7 +56,7 @@
package org.apache.geronimo.xml.deployment;
import
org.apache.geronimo.deployment.model.geronimo.appclient.ApplicationClient;
-import org.apache.geronimo.deployment.model.geronimo.j2ee.EJBRef;
+import org.apache.geronimo.deployment.model.geronimo.j2ee.EjbRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.ServiceRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.ResourceRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.ResourceEnvRef;
@@ -81,7 +81,7 @@
}
ApplicationClient appClient = new ApplicationClient();
appClient.setEnvEntry(j2eeLoader.loadEnvEntries(root, new
EnvEntry[0]));
- appClient.setEJBRef((EJBRef[])j2eeLoader.loadEJBRefs(root, new
EJBRef[0]));
+ appClient.setEJBRef((EjbRef[])j2eeLoader.loadEJBRefs(root, new
EjbRef[0]));
appClient.setServiceRef((ServiceRef[])j2eeLoader.loadServiceRefs(root, new
ServiceRef[0]));
appClient.setResourceRef((ResourceRef[])j2eeLoader.loadResourceRefs(root, new
ResourceRef[0]));
appClient.setResourceEnvRef((ResourceEnvRef[])j2eeLoader.loadResourceEnvRefs(root,
new ResourceEnvRef[0]));
1.3 +7 -7
incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/GeronimoJ2EELoader.java
Index: GeronimoJ2EELoader.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/GeronimoJ2EELoader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GeronimoJ2EELoader.java 5 Sep 2003 20:18:03 -0000 1.2
+++ GeronimoJ2EELoader.java 5 Sep 2003 20:44:24 -0000 1.3
@@ -56,8 +56,8 @@
package org.apache.geronimo.xml.deployment;
-import org.apache.geronimo.deployment.model.geronimo.j2ee.EJBRef;
-import org.apache.geronimo.deployment.model.geronimo.j2ee.EJBLocalRef;
+import org.apache.geronimo.deployment.model.geronimo.j2ee.EjbRef;
+import org.apache.geronimo.deployment.model.geronimo.j2ee.EjbLocalRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.ResourceRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.ResourceEnvRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.ServiceRef;
@@ -72,21 +72,21 @@
*/
public class GeronimoJ2EELoader extends J2EELoader {
protected org.apache.geronimo.deployment.model.j2ee.EJBRef newEJBRef() {
- return new EJBRef();
+ return new EjbRef();
}
protected org.apache.geronimo.deployment.model.j2ee.EJBRef
loadEJBRef(Element e) {
- EJBRef ejbRef = (EJBRef) super.loadEJBRef(e);
+ EjbRef ejbRef = (EjbRef) super.loadEJBRef(e);
ejbRef.setJndiName(LoaderUtil.getChildContent(e, "jndi-name"));
return ejbRef;
}
protected org.apache.geronimo.deployment.model.j2ee.EJBLocalRef
newEJBLocalRef() {
- return new EJBLocalRef();
+ return new EjbLocalRef();
}
protected org.apache.geronimo.deployment.model.j2ee.EJBLocalRef
loadEJBLocalRef(Element e) {
- EJBLocalRef ejbRef = (EJBLocalRef) super.loadEJBLocalRef(e);
+ EjbLocalRef ejbRef = (EjbLocalRef) super.loadEJBLocalRef(e);
ejbRef.setJndiName(LoaderUtil.getChildContent(e, "jndi-name"));
return ejbRef;
}
