Author: ramkumar
Date: Thu Oct 8 10:21:28 2009
New Revision: 823115
URL: http://svn.apache.org/viewvc?rev=823115&view=rev
Log:
Changes in binding.ejb module to work in 2.x env.
Added:
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
(with props)
Modified:
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd
tuscany/java/sca/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
tuscany/java/sca/modules/binding-ejb-runtime/src/test/resources/account/account.composite
tuscany/java/sca/modules/binding-ejb/META-INF/MANIFEST.MF
tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
tuscany/java/sca/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
tuscany/java/sca/modules/pom.xml
Modified:
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd?rev=823115&r1=823114&r2=823115&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd
(original)
+++ tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd
Thu Oct 8 10:21:28 2009
@@ -24,6 +24,7 @@
<include schemaLocation="sca-binding-jms-1.1-cd04.xsd"/>
<include schemaLocation="sca-binding-jca-1.1-cd04.xsd"/>
<include schemaLocation="sca-binding-sca-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-binding-ejb-1.1-cd01.xsd"/>
<include schemaLocation="sca-definitions-1.1-cd04.xsd"/>
<include schemaLocation="sca-policy-1.1-cd04.xsd"/>
Added:
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd?rev=823115&view=auto
==============================================================================
---
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
(added)
+++
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
Thu Oct 8 10:21:28 2009
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. OASIS trademark,
+ IPR and other policies apply. -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema";
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903";
+ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903";
+ elementFormDefault="qualified">
+
+ <include schemaLocation="sca-core-1.1-cd04.xsd" />
+
+ <element name="binding.ejb" type="sca:EJBSessionBeanBinding"
+ substitutionGroup="sca:binding" />
+
+ <simpleType name="VersionValue">
+ <restriction base="string">
+ <enumeration value="EJB2" />
+ <enumeration value="EJB3" />
+ </restriction>
+ </simpleType>
+
+ <complexType name="EJBSessionBeanBinding">
+ <complexContent>
+ <extension base="sca:Binding">
+ <sequence>
+ <any namespace="##other"
processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </sequence>
+ <attribute name="homeInterface" type="NCName"
use="optional" />
+ <attribute name="ejb-link-name" type="string"
use="optional" />
+ <attribute name="ejb-version"
type="sca:VersionValue" use="optional"
+ default="EJB3" />
+ </extension>
+ </complexContent>
+ </complexType>
+</schema>
\ No newline at end of file
Propchange:
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: tuscany/java/sca/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ejb-runtime/META-INF/MANIFEST.MF?rev=823115&r1=823114&r2=823115&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ejb-runtime/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/binding-ejb-runtime/META-INF/MANIFEST.MF Thu Oct
8 10:21:28 2009
@@ -38,5 +38,4 @@
org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional
Bundle-SymbolicName: org.apache.tuscany.sca.binding.ejb.runtime
Bundle-DocURL: http://www.apache.org/
-
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
Modified:
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java?rev=823115&r1=823114&r2=823115&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
(original)
+++
tuscany/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
Thu Oct 8 10:21:28 2009
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.sca.binding.ejb.provider;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.binding.ejb.EJBBinding;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.provider.BindingProviderFactory;
@@ -25,7 +27,6 @@
import org.apache.tuscany.sca.provider.ServiceBindingProvider;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
/**
* A factory from creating the EJB binding provider.
@@ -35,19 +36,18 @@
public class EJBBindingProviderFactory implements
BindingProviderFactory<EJBBinding> {
public EJBBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
+ // empty constructor
}
-
- public ReferenceBindingProvider
createReferenceBindingProvider(RuntimeComponent component,
-
RuntimeComponentReference reference,
- EJBBinding
binding) {
- return new EJBBindingReferenceBindingProvider(component, reference,
binding);
+
+ public ReferenceBindingProvider
createReferenceBindingProvider(EndpointReference endpointReference) {
+ return new
EJBBindingReferenceBindingProvider((RuntimeComponent)endpointReference.getComponent(),
+
(RuntimeComponentReference)endpointReference.getReference(),
+
(EJBBinding)endpointReference.getBinding());
}
- public ServiceBindingProvider
createServiceBindingProvider(RuntimeComponent component,
-
RuntimeComponentService service,
- EJBBinding
binding) {
- return null;
- //throw new EJBBindingException("Service Binding not supported for EJB
Binding");
+ public ServiceBindingProvider createServiceBindingProvider(Endpoint
endpoint) {
+ // Service Binding not supported for EJB Binding
+ return null;
}
public Class<EJBBinding> getModelType() {
Modified:
tuscany/java/sca/modules/binding-ejb-runtime/src/test/resources/account/account.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ejb-runtime/src/test/resources/account/account.composite?rev=823115&r1=823114&r2=823115&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-ejb-runtime/src/test/resources/account/account.composite
(original)
+++
tuscany/java/sca/modules/binding-ejb-runtime/src/test/resources/account/account.composite
Thu Oct 8 10:21:28 2009
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712";
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903";
targetNamespace="http://sample";
name="account">
Modified: tuscany/java/sca/modules/binding-ejb/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ejb/META-INF/MANIFEST.MF?rev=823115&r1=823114&r2=823115&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ejb/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/binding-ejb/META-INF/MANIFEST.MF Thu Oct 8
10:21:28 2009
@@ -24,5 +24,5 @@
org.apache.tuscany.sca.policy;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.binding.ejb
Bundle-DocURL: http://www.apache.org/
-
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
+
Modified:
tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java?rev=823115&r1=823114&r2=823115&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
(original)
+++
tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
Thu Oct 8 10:21:28 2009
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.assembly.Base;
import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.xml.Constants;
/**
* An implementation of EJBBinding.
@@ -33,8 +32,9 @@
// Constants used when describing the EJB binding
// model and for setting up defaults
String BINDING_EJB = "binding.ejb";
- QName BINDING_EJB_QNAME = new QName(Constants.SCA11_NS, BINDING_EJB);
-
+ QName BINDING_EJB_QNAME = new QName(SCA11_NS, BINDING_EJB);
+ QName TYPE = new QName(SCA11_NS, BINDING_EJB);
+
// Constants for the XML describing the EJB Binding
String HOME_INTERFACE = "homeInterface";
String EJB_LINK_NAME = "ejb-link-name";
Modified:
tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java?rev=823115&r1=823114&r2=823115&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
(original)
+++
tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
Thu Oct 8 10:21:28 2009
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.sca.binding.ejb.impl;
+import javax.xml.namespace.QName;
+
import org.apache.tuscany.sca.binding.ejb.EJBBinding;
/**
@@ -147,6 +149,10 @@
public void setURI(String uri) {
this.uri = uri;
}
+
+ public QName getType() {
+ return TYPE;
+ }
public boolean isUnresolved() {
return this.unresolved;
Modified:
tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java?rev=823115&r1=823114&r2=823115&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
(original)
+++
tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
Thu Oct 8 10:21:28 2009
@@ -131,7 +131,6 @@
ejbBinding.setSessionType(EJBBinding.SessionType.STATEFUL);
} else {
error("UnknownEJBSessionType", reader, sessionType, name);
- //throw new ContributionReadException("Unknown EJB Session
Type of " + sessionType + " for " + name);
}
}
@@ -143,7 +142,6 @@
ejbBinding.setEjbVersion(EJBBinding.EJBVersion.EJB3);
} else {
error("UnknownEJBVersion", reader, ejbVersion, name);
- //throw new ContributionReadException("Unknown EJB Version of
" + ejbVersion + " for " + name);
}
}
@@ -167,11 +165,9 @@
if (ejbBinding.getURI() != null){
writer.writeAttribute(EJBBinding.URI, ejbBinding.getURI());
- }
-
+ }
// FIXME Implement the rest
-
writer.writeEndElement();
}
Modified:
tuscany/java/sca/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=823115&r1=823114&r2=823115&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
(original)
+++
tuscany/java/sca/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
Thu Oct 8 10:21:28 2009
@@ -16,4 +16,4 @@
# under the License.
# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.binding.ejb.impl.EJBBindingProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#binding.ejb,model=org.apache.tuscany.sca.binding.ejb.EJBBinding
+org.apache.tuscany.sca.binding.ejb.impl.EJBBindingProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#binding.ejb,model=org.apache.tuscany.sca.binding.ejb.EJBBinding
Modified: tuscany/java/sca/modules/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/pom.xml?rev=823115&r1=823114&r2=823115&view=diff
==============================================================================
--- tuscany/java/sca/modules/pom.xml (original)
+++ tuscany/java/sca/modules/pom.xml Thu Oct 8 10:21:28 2009
@@ -35,6 +35,8 @@
<module>assembly-xsd</module>
<module>binding-atom</module>
<module>binding-atom-runtime</module>
+ <module>binding-ejb</module>
+ <module>binding-ejb-runtime</module>
<module>binding-http</module>
<module>binding-http-runtime</module>
<module>binding-jms</module>
