diff options
author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-05-21 14:59:30 +0000 |
---|---|---|
committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-05-21 14:59:30 +0000 |
commit | 56dd4b8312aa2a708f0d9b3609094515e511bc02 (patch) | |
tree | 7e431117f69484425bc83af4e2abe630e8893a84 /branches/sca-java-1.x/modules/implementation-jee/src/main | |
parent | f254177a44d527690a901fe865b0561cc27b5f7f (diff) |
TUSCANY-3041- policySets & intents not resolved on implementation.jee, applied patch from vamsi
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@777142 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.x/modules/implementation-jee/src/main')
2 files changed, 12 insertions, 1 deletions
diff --git a/branches/sca-java-1.x/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationImpl.java b/branches/sca-java-1.x/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationImpl.java index 1a63f52d3e..4d16dbf35d 100644 --- a/branches/sca-java-1.x/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationImpl.java +++ b/branches/sca-java-1.x/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationImpl.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.implementation.jee.JEEImplementation; * * @version $Rev$ $Date$ */ -class JEEImplementationImpl extends ImplementationImpl implements JEEImplementation { +public class JEEImplementationImpl extends ImplementationImpl implements JEEImplementation { private String archive; diff --git a/branches/sca-java-1.x/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java b/branches/sca-java-1.x/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java index 99616318ea..072394df75 100644 --- a/branches/sca-java-1.x/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java +++ b/branches/sca-java-1.x/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java @@ -31,6 +31,7 @@ import org.apache.tuscany.sca.assembly.AssemblyFactory; import org.apache.tuscany.sca.assembly.ComponentType; import org.apache.tuscany.sca.assembly.Composite; import org.apache.tuscany.sca.assembly.xml.Constants; +import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; import org.apache.tuscany.sca.contribution.jee.ModelObject; import org.apache.tuscany.sca.contribution.jee.EjbModuleInfo; @@ -52,6 +53,7 @@ import org.apache.tuscany.sca.contribution.service.ContributionWriteException; import org.apache.tuscany.sca.implementation.jee.JEEImplementation; import org.apache.tuscany.sca.implementation.jee.JEEImplementationFactory; import org.apache.tuscany.sca.monitor.Monitor; +import org.apache.tuscany.sca.policy.PolicyFactory; /** * Implements a StAX artifact processor for JEE implementations. @@ -62,17 +64,21 @@ public class JEEImplementationProcessor extends BaseStAXArtifactProcessor implem private static final QName IMPLEMENTATION_JEE = new QName(Constants.SCA10_NS, "implementation.jee"); private AssemblyFactory assemblyFactory; + private PolicyFactory policyFactory; private JEEImplementationFactory implementationFactory; private JavaEEExtension jeeExtension; private JavaEEOptionalExtension jeeOptionalExtension; private Monitor monitor; + private PolicyAttachPointProcessor policyProcessor; public JEEImplementationProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) { this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class); + this.policyFactory = modelFactories.getFactory(PolicyFactory.class); this.implementationFactory = modelFactories.getFactory(JEEImplementationFactory.class); this.jeeExtension = modelFactories.getFactory(JavaEEExtension.class); this.jeeOptionalExtension = modelFactories.getFactory(JavaEEOptionalExtension.class); this.monitor = monitor; + this.policyProcessor = new PolicyAttachPointProcessor(policyFactory); } public QName getArtifactType() { @@ -100,6 +106,9 @@ public class JEEImplementationProcessor extends BaseStAXArtifactProcessor implem implementation.setURI(archive); } + // Read policies + policyProcessor.readPolicies(implementation, reader); + // Skip to end element while (reader.hasNext()) { if (reader.next() == END_ELEMENT && IMPLEMENTATION_JEE.equals(reader.getName())) { @@ -266,9 +275,11 @@ public class JEEImplementationProcessor extends BaseStAXArtifactProcessor implem public void write(JEEImplementation implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException { // Write <implementation.jee> + policyProcessor.writePolicyPrefixes(implementation, writer); writeStart(writer, IMPLEMENTATION_JEE.getNamespaceURI(), IMPLEMENTATION_JEE.getLocalPart(), new XAttr("archive", implementation.getArchive())); + policyProcessor.writePolicyAttributes(implementation, writer); writeEnd(writer); } } |