Author: rfeng
Date: Thu Mar 20 09:43:46 2008
New Revision: 639350
URL: http://svn.apache.org/viewvc?rev=639350&view=rev
Log:
Adjust the Interface/Operation model to accommodate policySets and intents
Add the PolicyJavaInterfaceVisitor
Added:
incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
(with props)
incubator/tuscany/java/sca/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
(with props)
Modified:
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
incubator/tuscany/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
incubator/tuscany/java/sca/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
Modified:
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java?rev=639350&r1=639349&r2=639350&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
Thu Mar 20 09:43:46 2008
@@ -36,7 +36,6 @@
import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
import org.apache.tuscany.sca.interfacedef.java.JavaOperation;
import
org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor;
-import org.osoa.sca.annotations.Reference;
/**
* The databinding annotation processor for java interfaces
@@ -46,8 +45,7 @@
public class DataBindingJavaInterfaceProcessor implements JavaInterfaceVisitor
{
private DataBindingExtensionPoint dataBindingRegistry;
- public DataBindingJavaInterfaceProcessor(@Reference
- DataBindingExtensionPoint dataBindingRegistry) {
+ public DataBindingJavaInterfaceProcessor(DataBindingExtensionPoint
dataBindingRegistry) {
super();
this.dataBindingRegistry = dataBindingRegistry;
}
Modified:
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java?rev=639350&r1=639349&r2=639350&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
(original)
+++
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
Thu Mar 20 09:43:46 2008
@@ -54,7 +54,26 @@
extensionPoints.put(i, extensionPoint);
}
}
-
+
+ private Constructor<?> getConstructor(Constructor<?>[] constructors,
Class<?>[] paramTypes) {
+ for (Constructor<?> c : constructors) {
+ Class<?> types[] = c.getParameterTypes();
+ if (c.getParameterTypes().length == paramTypes.length) {
+ boolean found = true;
+ for (int i = 0; i < types.length; i++) {
+ if (types[i] != paramTypes[i]) {
+ found = false;
+ break;
+ }
+ }
+ if (found) {
+ return c;
+ }
+ }
+ }
+ return null;
+ }
+
/**
* Get the extension point by the interface that it implements
*
@@ -71,23 +90,26 @@
ServiceDiscovery.getInstance().loadFirstServiceClass(extensionPointType);
if (extensionPointClass != null) {
// Construct the extension point
- try {
- Constructor constructor =
extensionPointClass.getConstructor();
- extensionPoint = constructor.newInstance();
- } catch (NoSuchMethodException e) {
- try {
- Constructor constructor =
extensionPointClass.getConstructor(ModelFactoryExtensionPoint.class);
- extensionPoint =
constructor.newInstance(getExtensionPoint(ModelFactoryExtensionPoint.class));
- } catch (NoSuchMethodException e2) {
- try {
- Constructor constructor =
extensionPointClass.getConstructor(ExtensionPointRegistry.class);
- extensionPoint = constructor.newInstance(this);
- } catch (NoSuchMethodException e3) {
- throw new IllegalArgumentException(e3);
+ Constructor<?>[] constructors =
extensionPointClass.getConstructors();
+ Constructor constructor =
+ getConstructor(constructors, new Class<?>[]
{ModelFactoryExtensionPoint.class});
+ if (constructor != null) {
+ extensionPoint =
constructor.newInstance(getExtensionPoint(ModelFactoryExtensionPoint.class));
+ } else {
+ constructor = getConstructor(constructors, new
Class<?>[] {ExtensionPointRegistry.class});
+ if (constructor != null) {
+ extensionPoint = constructor.newInstance(this);
+ } else {
+ constructor = getConstructor(constructors, new
Class<?>[] {});
+ if (constructor != null) {
+ extensionPoint = constructor.newInstance();
+ } else {
+ throw new IllegalArgumentException(
+ "No valid
constructor is found for " + extensionPointClass);
}
}
}
-
+
// Cache the loaded extension point
addExtensionPoint(extensionPoint);
}
Modified:
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java?rev=639350&r1=639349&r2=639350&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
(original)
+++
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
Thu Mar 20 09:43:46 2008
@@ -97,7 +97,7 @@
modelFactories.addFactory(policyFactory);
ContributionFactory contributionFactory =
modelFactories.getFactory(ContributionFactory.class);
InterfaceContractMapper interfaceContractMapper = new
InterfaceContractMapperImpl();
- JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory();
+ JavaInterfaceFactory javaFactory = new
DefaultJavaInterfaceFactory(modelFactories);
modelFactories.addFactory(javaFactory);
JavaImplementationFactory javaImplementationFactory = new
BeanJavaImplementationFactory(beanFactory);
modelFactories.addFactory(javaImplementationFactory);
Modified:
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java?rev=639350&r1=639349&r2=639350&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
Thu Mar 20 09:43:46 2008
@@ -23,6 +23,7 @@
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
+import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceImpl;
import org.apache.tuscany.sca.policy.Intent;
/**
@@ -31,7 +32,7 @@
*
* @version $Rev$ $Date$
*/
-public class BeanJavaInterfaceImpl implements JavaInterface {
+public class BeanJavaInterfaceImpl extends JavaInterfaceImpl implements
JavaInterface {
private String className;
private Class<?> javaClass;
Modified:
incubator/tuscany/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java?rev=639350&r1=639349&r2=639350&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
Thu Mar 20 09:43:46 2008
@@ -32,6 +32,8 @@
import org.apache.tuscany.sca.implementation.java.JavaImplementation;
import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
+import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
+import
org.apache.tuscany.sca.interfacedef.java.impl.PolicyJavaInterfaceVisitor;
import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
@@ -44,6 +46,7 @@
public class PolicyProcessorTestCase extends TestCase {
private ServiceProcessor serviceProcessor;
private PolicyProcessor policyProcessor;
+ private PolicyJavaInterfaceVisitor visitor;
private JavaImplementation type;
// This actually is a test for PolicyJavaInterfaceProcessor. It will get
@@ -51,36 +54,42 @@
// ServiceProcessor. Of course ServiceProcessor class has to be working.
public void stestSingleInterfaceWithIntentsOnInterfaceAtInterfaceLevel()
throws Exception {
serviceProcessor.visitClass(Service1.class, type);
+
visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
policyProcessor.visitClass(Service1.class, type);
verifyIntents(Service1.class, type);
}
public void
stestMultipleInterfacesWithIntentsOnInterfaceAtInterfaceLevel() throws
Exception {
serviceProcessor.visitClass(Service2.class, type);
+
visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
policyProcessor.visitClass(Service2.class, type);
verifyIntents(Service2.class, type);
}
public void stestSingleInterfaceWithIntentsOnImplAtClassLevel() throws
Exception {
serviceProcessor.visitClass(Service3.class, type);
+
visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
policyProcessor.visitClass(Service3.class, type);
verifyIntents(Service3.class, type);
}
public void stestMultipleInterfacesWithIntentsOnImplAtClassLevel() throws
Exception {
serviceProcessor.visitClass(Service4.class, type);
+
visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
policyProcessor.visitClass(Service4.class, type);
verifyIntents(Service4.class, type);
}
public void stestSingleInterfaceWithIntentsOnInterfaceAtMethodLevel()
throws Exception {
serviceProcessor.visitClass(Service5.class, type);
+
visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
policyProcessor.visitClass(Service5.class, type);
verifyIntents(Service5.class, type);
}
public void
testSingleInterfaceWithIntentsOnServiceAndInterfaceAtImplAndInertfaceAndMethodLevel()
throws Exception {
serviceProcessor.visitClass(Service6.class, type);
+
visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
policyProcessor.visitClass(Service6.class, type);
for (Method method : Service6.class.getDeclaredMethods()) {
policyProcessor.visitMethod(method, type);
@@ -132,7 +141,7 @@
if (interfaceIntentAnnotation != null) {
String[] interfaceIntents = interfaceIntentAnnotation.value();
- List<Intent> requiredIntents = service.getRequiredIntents();
+ List<Intent> requiredIntents =
service.getInterfaceContract().getInterface().getRequiredIntents();
if (interfaceIntents.length > 0) {
if (requiredIntents == null || requiredIntents.size() ==
0) {
fail("No Intents on the service " + service.getName());
@@ -227,6 +236,7 @@
super.setUp();
serviceProcessor = new ServiceProcessor(new DefaultAssemblyFactory(),
new DefaultJavaInterfaceFactory());
policyProcessor = new PolicyProcessor(new DefaultAssemblyFactory(),
new DefaultPolicyFactory());
+ visitor = new PolicyJavaInterfaceVisitor(new DefaultPolicyFactory());
JavaImplementationFactory javaImplementationFactory = new
DefaultJavaImplementationFactory();
type = javaImplementationFactory.createJavaImplementation();
}
Modified:
incubator/tuscany/java/sca/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java?rev=639350&r1=639349&r2=639350&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
Thu Mar 20 09:43:46 2008
@@ -30,6 +30,10 @@
@WebService
public class MyServiceImpl {
+ public MyServiceImpl() {
+ super();
+ }
+
@WebMethod
public <T extends Bean1> T getBean(T b, Bean2 b2) {
return null;
@@ -38,6 +42,11 @@
@WebMethod
public List<? extends Bean1> getBeans() {
return null;
+ }
+
+ @WebMethod
+ public String convert(String str, int i) throws MyException {
+ return "ME";
}
}
Modified:
incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java?rev=639350&r1=639349&r2=639350&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
(original)
+++
incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
Thu Mar 20 09:43:46 2008
@@ -22,21 +22,28 @@
import java.util.List;
import java.util.Set;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceFactoryImpl;
+import
org.apache.tuscany.sca.interfacedef.java.impl.PolicyJavaInterfaceVisitor;
import
org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor;
+import org.apache.tuscany.sca.policy.PolicyFactory;
/**
* A factory for the Java interface model.
*/
public class DefaultJavaInterfaceFactory extends JavaInterfaceFactoryImpl
implements JavaInterfaceFactory {
-
+ private ModelFactoryExtensionPoint modelFactoryExtensionPoint;
private boolean loadedVisitors;
public DefaultJavaInterfaceFactory() {
}
+ public DefaultJavaInterfaceFactory(ModelFactoryExtensionPoint
modelFactoryExtensionPoint) {
+ this.modelFactoryExtensionPoint = modelFactoryExtensionPoint;
+ }
+
@Override
public List<JavaInterfaceVisitor> getInterfaceVisitors() {
loadVisitors();
@@ -50,7 +57,14 @@
private void loadVisitors() {
if (loadedVisitors)
return;
-
+
+ if (modelFactoryExtensionPoint != null) {
+ PolicyFactory policyFactory =
modelFactoryExtensionPoint.getFactory(PolicyFactory.class);
+ if (policyFactory != null) {
+ addInterfaceVisitor(new
PolicyJavaInterfaceVisitor(policyFactory));
+ }
+ }
+
// Get the databinding service declarations
Set<ServiceDeclaration> visitorDeclarations;
try {
Modified:
incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java?rev=639350&r1=639349&r2=639350&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
Thu Mar 20 09:43:46 2008
@@ -94,8 +94,8 @@
}
@Override
- public JavaInterfaceImpl clone() throws CloneNotSupportedException {
- return (JavaInterfaceImpl) super.clone();
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
}
}
Added:
incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java?rev=639350&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
(added)
+++
incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
Thu Mar 20 09:43:46 2008
@@ -0,0 +1,159 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.sca.interfacedef.java.impl;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
+import org.apache.tuscany.sca.interfacedef.java.JavaOperation;
+import
org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor;
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.PolicyFactory;
+import org.apache.tuscany.sca.policy.PolicySet;
+import org.osoa.sca.annotations.PolicySets;
+import org.osoa.sca.annotations.Requires;
+
+/**
+ * Processes an [EMAIL PROTECTED] org.osoa.sca.annotations.Requires} annotation
+ *
+ * @version $Rev:
+ */
+public class PolicyJavaInterfaceVisitor implements JavaInterfaceVisitor {
+ private PolicyFactory policyFactory;
+
+ public PolicyJavaInterfaceVisitor(PolicyFactory policyFactory) {
+ super();
+ this.policyFactory = policyFactory;
+ }
+
+ private QName getQName(String intentName) {
+ QName qname;
+ if (intentName.startsWith("{")) {
+ int i = intentName.indexOf('}');
+ if (i != -1) {
+ qname = new QName(intentName.substring(1, i),
intentName.substring(i + 1));
+ } else {
+ qname = new QName("", intentName);
+ }
+ } else {
+ qname = new QName("", intentName);
+ }
+ return qname;
+ }
+
+ /**
+ * Read policy intents on the given interface or class
+ * @param clazz
+ * @param requiredIntents
+ */
+ private void readIntentsAndPolicySets(Class<?> clazz, List<Intent>
requiredIntents, List<PolicySet> policySets) {
+ Requires intentAnnotation = clazz.getAnnotation(Requires.class);
+ if (intentAnnotation != null) {
+ String[] intentNames = intentAnnotation.value();
+ if (intentNames.length != 0) {
+ for (String intentName : intentNames) {
+
+ // Add each intent to the list
+ Intent intent = policyFactory.createIntent();
+ intent.setName(getQName(intentName));
+ requiredIntents.add(intent);
+ }
+ }
+ }
+
+ PolicySets policySetAnnotation = clazz.getAnnotation(PolicySets.class);
+ if (policySetAnnotation != null) {
+ String[] policySetNames = policySetAnnotation.value();
+ if (policySetNames.length != 0) {
+ for (String policySetName : policySetNames) {
+
+ // Add each intent to the list
+ PolicySet policySet = policyFactory.createPolicySet();
+ policySet.setName(getQName(policySetName));
+ policySets.add(policySet);
+ }
+ }
+ }
+ }
+
+ private void readIntents(Requires intentAnnotation, List<Intent>
requiredIntents) {
+ //Requires intentAnnotation = method.getAnnotation(Requires.class);
+ if (intentAnnotation != null) {
+ String[] intentNames = intentAnnotation.value();
+ if (intentNames.length != 0) {
+ //Operation operation = assemblyFactory.createOperation();
+ //operation.setName(method.getName());
+ //operation.setUnresolved(true);
+ for (String intentName : intentNames) {
+
+ // Add each intent to the list, associated with the
+ // operation corresponding to the annotated method
+ Intent intent = policyFactory.createIntent();
+ intent.setName(getQName(intentName));
+ //intent.getOperations().add(operation);
+ requiredIntents.add(intent);
+ }
+ }
+ }
+ }
+
+ private void readPolicySets(PolicySets policySetAnnotation,
List<PolicySet> policySets) {
+ if (policySetAnnotation != null) {
+ String[] policySetNames = policySetAnnotation.value();
+ if (policySetNames.length != 0) {
+ //Operation operation = assemblyFactory.createOperation();
+ //operation.setName(method.getName());
+ //operation.setUnresolved(true);
+ for (String policySetName : policySetNames) {
+ // Add each intent to the list, associated with the
+ // operation corresponding to the annotated method
+ PolicySet policySet = policyFactory.createPolicySet();
+ policySet.setName(getQName(policySetName));
+ //intent.getOperations().add(operation);
+ policySets.add(policySet);
+ }
+ }
+ }
+ }
+
+ public void visitInterface(JavaInterface javaInterface) throws
InvalidInterfaceException {
+
+ if (javaInterface.getJavaClass() != null) {
+ readIntentsAndPolicySets(javaInterface.getJavaClass(),
javaInterface.getRequiredIntents(), javaInterface
+ .getPolicySets());
+
+ // Read intents on the service interface methods
+ List<Operation> operations = javaInterface.getOperations();
+ for (Operation op : operations) {
+ JavaOperation operation = (JavaOperation)op;
+ Method method = operation.getJavaMethod();
+ if (method.getAnnotation(Requires.class) != null ||
method.getAnnotation(PolicySets.class) != null) {
+ readIntents(method.getAnnotation(Requires.class),
op.getRequiredIntents());
+ readPolicySets(method.getAnnotation(PolicySets.class),
op.getPolicySets());
+ }
+ }
+ }
+ }
+
+}
Propchange:
incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/tuscany/java/sca/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java?rev=639350&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
(added)
+++
incubator/tuscany/java/sca/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
Thu Mar 20 09:43:46 2008
@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.sca.interfacedef.java.introspection.impl;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
+import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
+import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
+import
org.apache.tuscany.sca.interfacedef.java.impl.PolicyJavaInterfaceVisitor;
+import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
+import org.osoa.sca.annotations.PolicySets;
+import org.osoa.sca.annotations.Requires;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class PolicyProcessorTestCase extends TestCase {
+ private JavaInterfaceFactory factory = new DefaultJavaInterfaceFactory();
+ private PolicyJavaInterfaceVisitor policyProcessor;
+
+ public void testInterfaceLevel() throws Exception {
+ JavaInterface type = factory.createJavaInterface(Interface1.class);
+ policyProcessor.visitInterface(type);
+ assertEquals(1, type.getRequiredIntents().size());
+ assertEquals(1, type.getPolicySets().size());
+ }
+
+ public void testMethodLevel() throws Exception {
+ JavaInterface type = factory.createJavaInterface(Interface2.class);
+ policyProcessor.visitInterface(type);
+ assertEquals(0, type.getRequiredIntents().size());
+ assertEquals(1,
type.getOperations().get(0).getRequiredIntents().size());
+ assertEquals(1,
type.getOperations().get(1).getRequiredIntents().size());
+ assertEquals(0, type.getPolicySets().size());
+ assertEquals(1, type.getOperations().get(0).getPolicySets().size());
+ assertEquals(1, type.getOperations().get(1).getPolicySets().size());
+ }
+
+ public void testInterfaceAndMethodLevel() throws Exception {
+ JavaInterface type = factory.createJavaInterface(Interface3.class);
+ policyProcessor.visitInterface(type);
+ assertEquals(1, type.getRequiredIntents().size());
+ assertEquals(1,
type.getOperations().get(0).getRequiredIntents().size());
+ assertEquals(1,
type.getOperations().get(1).getRequiredIntents().size());
+ assertEquals(1, type.getPolicySets().size());
+ assertEquals(1, type.getOperations().get(0).getPolicySets().size());
+ assertEquals(1, type.getOperations().get(1).getPolicySets().size());
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ policyProcessor = new PolicyJavaInterfaceVisitor(new
DefaultPolicyFactory());
+ }
+
+ // @Remotable
+ @Requires( {"transaction.global"})
+ @PolicySets( {"{http://ns1}PS1"})
+ private interface Interface1 {
+ int method1();
+
+ int method2();
+
+ int method3();
+
+ int method4();
+ }
+
+ private interface Interface2 {
+ @Requires( {"transaction.global"})
+ @PolicySets( {"{http://ns1}PS1"})
+ int method1();
+
+ @Requires( {"transaction.local"})
+ @PolicySets( {"{http://ns1}PS2"})
+ int method2();
+ }
+
+ @Requires( {"transaction.global.Interface6"})
+ @PolicySets( {"{http://ns1}PS1"})
+ private interface Interface3 {
+ @Requires( {"transaction.global.Interface6.method1"})
+ @PolicySets( {"{http://ns1}PS2"})
+ int method1();
+
+ @Requires( {"transaction.local.Interface6.method2"})
+ @PolicySets( {"{http://ns1}PS3"})
+ int method2();
+ }
+
+}
Propchange:
incubator/tuscany/java/sca/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java?rev=639350&r1=639349&r2=639350&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
(original)
+++
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
Thu Mar 20 09:43:46 2008
@@ -20,12 +20,14 @@
import java.util.List;
+import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
+
/**
* Represents a service interface. This interface will typically be extended to
* support concrete interface type systems, such as Java interfaces, WSDL 1.1
* portTypes and WSDL 2.0 interfaces.
*/
-public interface Interface extends Cloneable {
+public interface Interface extends Cloneable, PolicySetAttachPoint {
/**
* Returns true if the interface is a remotable interface..
Modified:
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java?rev=639350&r1=639349&r2=639350&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
(original)
+++
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
Thu Mar 20 09:43:46 2008
@@ -21,11 +21,12 @@
import java.util.List;
import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
+import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
/**
* Represents an operation on a service interface.
*/
-public interface Operation extends Cloneable {
+public interface Operation extends Cloneable, PolicySetAttachPoint {
/**
* Returns the name of the operation.
*
Modified:
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java?rev=639350&r1=639349&r2=639350&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
Thu Mar 20 09:43:46 2008
@@ -26,6 +26,9 @@
import org.apache.tuscany.sca.interfacedef.Interface;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.IntentAttachPointType;
+import org.apache.tuscany.sca.policy.PolicySet;
/**
* Represents a service interface.
@@ -39,6 +42,12 @@
private OperationList operations = new OperationList();
private boolean unresolved;
+ private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
+ private IntentAttachPointType type;
+ private List<PolicySet> policySets = new ArrayList<PolicySet>();
+ private List<Intent> requiredIntents = new ArrayList<Intent>();
+
+
public boolean isRemotable() {
return remotable;
}
@@ -212,9 +221,29 @@
public boolean isDynamic() {
return false;
}
+
+ public List<PolicySet> getApplicablePolicySets() {
+ return applicablePolicySets;
+ }
+
+ public List<PolicySet> getPolicySets() {
+ return policySets;
+ }
+
+ public List<Intent> getRequiredIntents() {
+ return requiredIntents;
+ }
+
+ public IntentAttachPointType getType() {
+ return type;
+ }
+
+ public void setType(IntentAttachPointType type) {
+ this.type = type;
+ }
@Override
- public InterfaceImpl clone() throws CloneNotSupportedException {
+ public Object clone() throws CloneNotSupportedException {
InterfaceImpl copy = (InterfaceImpl)super.clone();
copy.operations = new OperationList();
for (Operation operation : this.operations) {
Modified:
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java?rev=639350&r1=639349&r2=639350&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
Thu Mar 20 09:43:46 2008
@@ -26,6 +26,9 @@
import org.apache.tuscany.sca.interfacedef.Interface;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.IntentAttachPointType;
+import org.apache.tuscany.sca.policy.PolicySet;
/**
* Represents an operation on a service interface.
@@ -46,6 +49,11 @@
private WrapperInfo wrapper;
private String dataBinding;
private boolean dynamic;
+
+ private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
+ private List<PolicySet> policySets = new ArrayList<PolicySet>();
+ private List<Intent> requiredIntents = new ArrayList<Intent>();
+ private IntentAttachPointType type;
/**
* @param name
@@ -290,6 +298,26 @@
}
return copy;
+ }
+
+ public List<PolicySet> getApplicablePolicySets() {
+ return applicablePolicySets;
+ }
+
+ public List<PolicySet> getPolicySets() {
+ return policySets;
+ }
+
+ public List<Intent> getRequiredIntents() {
+ return requiredIntents;
+ }
+
+ public IntentAttachPointType getType() {
+ return type;
+ }
+
+ public void setType(IntentAttachPointType type) {
+ this.type = type;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
