Author: slaws
Date: Fri May 29 08:22:48 2009
New Revision: 779891
URL: http://svn.apache.org/viewvc?rev=779891&view=rev
Log:
TUSCANY-3052 - add EJBModuleInfo to generate EJB implementation to sit
alongside the EJBInfo.
Modified:
tuscany/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBImplementationGenerated.java
tuscany/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EJBImplementationGeneratedImpl.java
tuscany/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java
tuscany/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java
Modified:
tuscany/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBImplementationGenerated.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBImplementationGenerated.java?rev=779891&r1=779890&r2=779891&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBImplementationGenerated.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBImplementationGenerated.java
Fri May 29 08:22:48 2009
@@ -40,4 +40,17 @@
*/
void setEJBInfo(EjbInfo ejbInfo);
+ /**
+ * return the EjbModuleInfo which contains the EJB Info used to generate
this object
+ *
+ * @return
+ */
+ EjbModuleInfo getEjbModuleInfo();
+
+ /**
+ * Set the EjbModuleInfo which contains the EJB Info used to generate this
object
+ *
+ * @param ejbModuleInfo
+ */
+ void setEjbModuleInfo(EjbModuleInfo ejbModuleInfo);
}
Modified:
tuscany/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EJBImplementationGeneratedImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EJBImplementationGeneratedImpl.java?rev=779891&r1=779890&r2=779891&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EJBImplementationGeneratedImpl.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EJBImplementationGeneratedImpl.java
Fri May 29 08:22:48 2009
@@ -22,6 +22,7 @@
import org.apache.tuscany.sca.assembly.impl.ImplementationImpl;
import org.apache.tuscany.sca.contribution.jee.EJBImplementationGenerated;
import org.apache.tuscany.sca.contribution.jee.EjbInfo;
+import org.apache.tuscany.sca.contribution.jee.EjbModuleInfo;
/**
* The model representing an EJB implementation in an SCA assembly model when
the
@@ -30,6 +31,7 @@
class EJBImplementationGeneratedImpl extends ImplementationImpl implements
EJBImplementationGenerated {
private EjbInfo ejbInfo;
+ private EjbModuleInfo ejbModuleInfo;
/**
* Constructs a new EJB implementation.
@@ -56,5 +58,13 @@
public void setEJBInfo(EjbInfo ejbInfo) {
this.ejbInfo = ejbInfo;
}
+
+ public EjbModuleInfo getEjbModuleInfo() {
+ return ejbModuleInfo;
+ }
+
+ public void setEjbModuleInfo(EjbModuleInfo ejbModuleInfo) {
+ this.ejbModuleInfo = ejbModuleInfo;
+ }
}
Modified:
tuscany/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java?rev=779891&r1=779890&r2=779891&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java
Fri May 29 08:22:48 2009
@@ -109,7 +109,7 @@
for(Map.Entry<String, EjbInfo> entry :
ejbModule.getEjbInfos().entrySet()) {
EjbInfo ejbInfo = entry.getValue();
- Component component = findComponent(composite, ejbInfo);
+ Component component = findComponent(composite, ejbInfo, ejbModule);
if(ejbInfo.ejbType.compareTo(EjbType.MESSAGE_DRIVEN) != 0) {
for(Class<?> intf : ejbInfo.businessRemote) {
@@ -161,7 +161,7 @@
for(Map.Entry<String, EjbInfo> entry :
ejbModule.getEjbInfos().entrySet()) {
EjbInfo ejbInfo = entry.getValue();
- Component component = findComponent(composite, ejbInfo);
+ Component component = findComponent(composite, ejbInfo,
ejbModule);
if(ejbInfo.ejbType.compareTo(EjbType.MESSAGE_DRIVEN) != 0) {
for(Class<?> intf : ejbInfo.businessRemote) {
@@ -215,7 +215,7 @@
* @param componentName
* @return
*/
- private Component findComponent(Composite composite, EjbInfo ejbInfo){
+ private Component findComponent(Composite composite, EjbInfo ejbInfo,
EjbModuleInfo ejbmoduleInfo){
String componentName = ejbInfo.beanName;
Component component = null;
@@ -235,6 +235,7 @@
EJBImplementationGenerated implementation = new
EJBImplementationGeneratedImpl();
implementation.setUnresolved(true);
implementation.setEJBInfo(ejbInfo);
+ implementation.setEjbModuleInfo(ejbmoduleInfo);
component.setImplementation(implementation);
}
Modified:
tuscany/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java?rev=779891&r1=779890&r2=779891&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java
Fri May 29 08:22:48 2009
@@ -206,7 +206,7 @@
for(Map.Entry<String, EjbInfo> entry :
ejbModule.getEjbInfos().entrySet()) {
EjbInfo ejbInfo = entry.getValue();
- Component component = findComponent(composite, ejbInfo);
+ Component component = findComponent(composite, ejbInfo, ejbModule);
// Process Remote EJB References
for(Map.Entry<String, EjbReferenceInfo> entry1 :
ejbInfo.ejbReferences.entrySet()) {
@@ -241,7 +241,7 @@
for(Map.Entry<String, EjbInfo> entry :
ejbModule.getEjbInfos().entrySet()) {
EjbInfo ejbInfo = entry.getValue();
- Component component = findComponent(composite, ejbInfo);
+ Component component = findComponent(composite, ejbInfo,
ejbModule);
// Process Remote EJB References
for(Map.Entry<String, EjbReferenceInfo> entry1 :
ejbInfo.ejbReferences.entrySet()) {
@@ -277,7 +277,7 @@
* @param ejbInfo
* @return
*/
- private Component findComponent(Composite composite, EjbInfo ejbInfo){
+ private Component findComponent(Composite composite, EjbInfo ejbInfo,
EjbModuleInfo ejbmoduleInfo){
String componentName = ejbInfo.beanName;
Component component = null;
@@ -297,6 +297,7 @@
EJBImplementationGenerated implementation = new
EJBImplementationGeneratedImpl();
implementation.setUnresolved(true);
implementation.setEJBInfo(ejbInfo);
+ implementation.setEjbModuleInfo(ejbmoduleInfo);
component.setImplementation(implementation);
}
