You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2009/04/22 15:48:18 UTC
svn commit: r767522 -
/tuscany/branches/sca-java-1.x/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java
Author: antelder
Date: Wed Apr 22 13:48:18 2009
New Revision: 767522
URL: http://svn.apache.org/viewvc?rev=767522&view=rev
Log:
Update to introspect external ear archives
Modified:
tuscany/branches/sca-java-1.x/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java
Modified: tuscany/branches/sca-java-1.x/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java?rev=767522&r1=767521&r2=767522&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java Wed Apr 22 13:48:18 2009
@@ -20,6 +20,7 @@
import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
+import java.io.File;
import java.net.URI;
import javax.xml.namespace.QName;
@@ -32,19 +33,21 @@
import org.apache.tuscany.sca.assembly.xml.Constants;
import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.contribution.jee.EjbModuleInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo;
import org.apache.tuscany.sca.contribution.jee.JavaEEExtension;
+import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector;
import org.apache.tuscany.sca.contribution.jee.JavaEEOptionalExtension;
import org.apache.tuscany.sca.contribution.jee.WebModuleInfo;
-import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo;
import org.apache.tuscany.sca.contribution.jee.impl.EjbModuleInfoImpl;
-import org.apache.tuscany.sca.contribution.jee.impl.WebModuleInfoImpl;
import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl;
+import org.apache.tuscany.sca.contribution.jee.impl.WebModuleInfoImpl;
import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.implementation.jee.JEEImplementation;
import org.apache.tuscany.sca.implementation.jee.JEEImplementationFactory;
import org.apache.tuscany.sca.monitor.Monitor;
@@ -57,13 +60,17 @@
public class JEEImplementationProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<JEEImplementation> {
private static final QName IMPLEMENTATION_JEE = new QName(Constants.SCA10_NS, "implementation.jee");
+ private ExtensionPointRegistry extensionPoints;
private AssemblyFactory assemblyFactory;
private JEEImplementationFactory implementationFactory;
private JavaEEExtension jeeExtension;
private JavaEEOptionalExtension jeeOptionalExtension;
private Monitor monitor;
+
- public JEEImplementationProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
+ public JEEImplementationProcessor(ExtensionPointRegistry extensionPoints, Monitor monitor) {
+ this.extensionPoints = extensionPoints;
+ ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
this.implementationFactory = modelFactories.getFactory(JEEImplementationFactory.class);
this.jeeExtension = modelFactories.getFactory(JavaEEExtension.class);
@@ -110,6 +117,7 @@
// Resolve the component type
String uri = implementation.getURI();
String archive = implementation.getArchive();
+ boolean unresolvedEar = false;;
if (uri != null) {
Object moduleInfo = null;
if(uri.equals("")) {
@@ -150,7 +158,8 @@
} else if(uri.endsWith(".ear")) {
JavaEEApplicationInfo appInfo = new JavaEEApplicationInfoImpl();
appInfo.setUri(URI.create(archive));
- appInfo = resolver.resolveModel(JavaEEApplicationInfo.class, appInfo);
+ JavaEEApplicationInfo resolved = resolver.resolveModel(JavaEEApplicationInfo.class, appInfo);
+ unresolvedEar = resolved == appInfo;
moduleInfo = appInfo;
}
@@ -174,6 +183,16 @@
}
// TODO: check for ejb-jar composite
} else if(moduleInfo instanceof JavaEEApplicationInfo) {
+ if (unresolvedEar) {
+ JavaEEIntrospector jeeIntrospector = extensionPoints.getExtensionPoint(JavaEEIntrospector.class);
+ try {
+ File f = new File(((JavaEEApplicationInfo)moduleInfo).getUri().toString());
+ moduleInfo = jeeIntrospector.introspectJeeArchive(f.toURI().toURL());
+ } catch (Exception e) {
+ throw new ContributionResolveException(e);
+ }
+ }
+
if(jeeExtension != null) {
ComponentType ct = jeeExtension.createImplementationJeeComponentType((JavaEEApplicationInfo)moduleInfo);
implementation.getServices().addAll(ct.getServices());