You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2011/10/17 15:54:44 UTC

svn commit: r1185171 - in /tuscany/sca-java-2.x/trunk: modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/security/jsr250/ modules/policy-security-jsr250/src/main/resources/META-INF/services/ testing/itest/interface-matching/ te...

Author: slaws
Date: Mon Oct 17 13:54:43 2011
New Revision: 1185171

URL: http://svn.apache.org/viewvc?rev=1185171&view=rev
Log:
Correct JSR250 policy processor package name in services definition

Modified:
    tuscany/sca-java-2.x/trunk/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/security/jsr250/JSR250PolicyProcessor.java
    tuscany/sca-java-2.x/trunk/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor
    tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/pom.xml
    tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceComponentImpl.java

Modified: tuscany/sca-java-2.x/trunk/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/security/jsr250/JSR250PolicyProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/security/jsr250/JSR250PolicyProcessor.java?rev=1185171&r1=1185170&r2=1185171&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/security/jsr250/JSR250PolicyProcessor.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/security/jsr250/JSR250PolicyProcessor.java Mon Oct 17 13:54:43 2011
@@ -28,6 +28,8 @@ import javax.xml.namespace.QName;
 
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.assembly.xml.Constants;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.introspect.BaseJavaClassVisitor;
@@ -58,6 +60,11 @@ public class JSR250PolicyProcessor exten
     
     private PolicyFactory policyFactory;
 
+    public JSR250PolicyProcessor(ExtensionPointRegistry registry) {
+        super(registry.getExtensionPoint(FactoryExtensionPoint.class).getFactory(AssemblyFactory.class));
+        this.policyFactory = registry.getExtensionPoint(FactoryExtensionPoint.class).getFactory(PolicyFactory.class);
+    }
+    
     public JSR250PolicyProcessor(AssemblyFactory assemblyFactory, PolicyFactory policyFactory) {
         super(assemblyFactory);
         this.policyFactory = policyFactory;

Modified: tuscany/sca-java-2.x/trunk/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor?rev=1185171&r1=1185170&r2=1185171&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor (original)
+++ tuscany/sca-java-2.x/trunk/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor Mon Oct 17 13:54:43 2011
@@ -17,4 +17,4 @@
 # 
 # NOTE: The ranking attribute is important for the JavaClassVistors 
 # Some visitors need to be called after the others 
-org.apache.tuscany.sca.implementation.java.introspect.impl.JSR250PolicyProcessor;ranking=600
\ No newline at end of file
+org.apache.tuscany.sca.policy.security.jsr250.JSR250PolicyProcessor;ranking=600
\ No newline at end of file

Modified: tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/pom.xml?rev=1185171&r1=1185170&r2=1185171&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/pom.xml Mon Oct 17 13:54:43 2011
@@ -70,6 +70,12 @@
         </dependency> 
         
         <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-security-jsr250</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>         
+        
+        <dependency>
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
             <version>3.2.9</version>

Modified: tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceComponentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceComponentImpl.java?rev=1185171&r1=1185170&r2=1185171&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceComponentImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceComponentImpl.java Mon Oct 17 13:54:43 2011
@@ -18,10 +18,12 @@
  */
 package org.apache.tuscany.sca.itest.interfaces;
 
+import javax.annotation.security.RolesAllowed;
+
 import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Reference;
 import org.oasisopen.sca.annotation.Service;
 
+@RolesAllowed({"Role1"})
 @Service(ServiceComponent.class)
 public class ServiceComponentImpl implements ServiceComponent {
 
@@ -30,6 +32,7 @@ public class ServiceComponentImpl implem
  
     private static ParameterObject po;
 
+    @RolesAllowed({"Role2", "Role3"})
     public String foo(String str) {
         return str;
     }
@@ -46,9 +49,7 @@ public class ServiceComponentImpl implem
         po = new ParameterObject("CallBack");
         callback.modifyParameter(po);
     }
-
-
-
+    
     public ParameterObject getPO() {
         return po;
     }