Author: vamsic007
Date: Thu Aug 14 04:44:26 2008
New Revision: 685861
URL: http://svn.apache.org/viewvc?rev=685861&view=rev
Log:
Add ejb intent to the computed references.
Modified:
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessor.java
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java
Modified:
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java?rev=685861&r1=685860&r2=685861&view=diff
==============================================================================
---
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java
(original)
+++
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java
Thu Aug 14 04:44:26 2008
@@ -54,7 +54,8 @@
private JavaInterfaceFactory jif;
public static final Map<String, QName> ALLOWED_ENV_ENTRY_TYPES;
- public static Intent CONVERSATIONAL_INTENT;
+ public static final Intent CONVERSATIONAL_INTENT;
+ public static final Intent EJB_INTENT;
static {
ALLOWED_ENV_ENTRY_TYPES = new HashMap<String, QName>();
ALLOWED_ENV_ENTRY_TYPES.put(String.class.getName(), new
QName("http://www.w3.org/2001/XMLSchema";, "string",
@@ -80,6 +81,8 @@
CONVERSATIONAL_INTENT = dpf.createIntent();
CONVERSATIONAL_INTENT.setName(new
QName("http://www.osoa.org/xmlns/sca/1.0";, "conversational"));
+ EJB_INTENT = dpf.createIntent();
+ EJB_INTENT.setName(new QName("http://www.osoa.org/xmlns/sca/1.0";,
"ejb"));
}
public AssemblyHelper() {
Modified:
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java?rev=685861&r1=685860&r2=685861&view=diff
==============================================================================
---
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java
(original)
+++
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java
Thu Aug 14 04:44:26 2008
@@ -180,6 +180,7 @@
ComponentReference componentReference =
helper.createComponentReference();
componentReference.setReference(reference);
componentReference.setInterfaceContract(reference.getInterfaceContract());
+
componentReference.getRequiredIntents().addAll(reference.getRequiredIntents());
component.getReferences().add(componentReference);
}
@@ -206,6 +207,7 @@
for (ComponentReference reference : component.getReferences()) {
CompositeReference compositeReference =
helper.createCompositeReference();
compositeReference.setInterfaceContract(reference.getInterfaceContract());
+
compositeReference.getRequiredIntents().addAll(reference.getRequiredIntents());
compositeReference.getPromotedReferences().add(reference);
composite.getReferences().add(compositeReference);
}
@@ -291,6 +293,7 @@
throw new ContributionException(e);
}
reference.setInterfaceContract(ic);
+ reference.getRequiredIntents().add(AssemblyHelper.EJB_INTENT);
componentType.getReferences().add(reference);
}
@@ -335,6 +338,7 @@
throw new ContributionException(e);
}
reference.setInterfaceContract(ic);
+ reference.getRequiredIntents().add(AssemblyHelper.EJB_INTENT);
componentType.getReferences().add(reference);
}
Modified:
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessor.java?rev=685861&r1=685860&r2=685861&view=diff
==============================================================================
---
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessor.java
(original)
+++
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessor.java
Thu Aug 14 04:44:26 2008
@@ -81,6 +81,7 @@
String referenceName = beanName2+"_"+reference.getName();
reference2.setName(referenceName);
reference2.setInterfaceContract(reference.getInterfaceContract());
+
reference2.getRequiredIntents().addAll(reference.getRequiredIntents());
componentType.getReferences().add(reference2);
}
}
Modified:
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java?rev=685861&r1=685860&r2=685861&view=diff
==============================================================================
---
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java
(original)
+++
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java
Thu Aug 14 04:44:26 2008
@@ -87,6 +87,7 @@
throw new ContributionException(e);
}
reference.setInterfaceContract(ic);
+ reference.getRequiredIntents().add(AssemblyHelper.EJB_INTENT);
componentType.getReferences().add(reference);
}
@@ -131,6 +132,7 @@
ComponentReference componentReference =
helper.createComponentReference();
componentReference.setReference(reference);
componentReference.setInterfaceContract(reference.getInterfaceContract());
+
componentReference.getRequiredIntents().addAll(reference.getRequiredIntents());
component.getReferences().add(componentReference);
}
@@ -148,6 +150,7 @@
for (ComponentReference reference : component.getReferences()) {
CompositeReference compositeReference =
helper.createCompositeReference();
compositeReference.setInterfaceContract(reference.getInterfaceContract());
+
compositeReference.getRequiredIntents().addAll(reference.getRequiredIntents());
compositeReference.getPromotedReferences().add(reference);
composite.getReferences().add(compositeReference);
}
