Author: jsdelfino
Date: Sun Sep 21 14:18:25 2008
New Revision: 697613
URL: http://svn.apache.org/viewvc?rev=697613&view=rev
Log:
Refactored policy-security-jsr250 to use the correct package name instead of
implementation.java, as it was conflicting with the packages in
implementation.java and breaking OSGi imports.
Added:
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/JSR250Activator.java
- copied, changed from r697612,
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JSR250Activator.java
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/introspect/
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/JSR250PolicyProcessor.java
- copied, changed from r697612,
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JSR250PolicyProcessor.java
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java
- copied, changed from r697612,
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCaseFIXME.java
Removed:
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JSR250Activator.java
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JSR250PolicyProcessor.java
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCaseFIXME.java
Modified:
tuscany/branches/sca-equinox/modules/policy-security-jsr250/pom.xml
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
Modified: tuscany/branches/sca-equinox/modules/policy-security-jsr250/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security-jsr250/pom.xml?rev=697613&r1=697612&r2=697613&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/policy-security-jsr250/pom.xml
(original)
+++ tuscany/branches/sca-equinox/modules/policy-security-jsr250/pom.xml Sun Sep
21 14:18:25 2008
@@ -71,9 +71,9 @@
<configuration>
<instructions>
<Bundle-Version>${tuscany.version}</Bundle-Version>
-
<Bundle-SymbolicName>org.apache.tuscany.sca.implementation.java</Bundle-SymbolicName>
+
<Bundle-SymbolicName>org.apache.tuscany.sca.policy.security.jsr250</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
-
<Export-Package>org.apache.tuscany.sca.implementation.java*</Export-Package>
+
<Export-Package>org.apache.tuscany.sca.policy.jsr250*</Export-Package>
</instructions>
</configuration>
</plugin>
Copied:
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/JSR250Activator.java
(from r697612,
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JSR250Activator.java)
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/JSR250Activator.java?p2=tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/JSR250Activator.java&p1=tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JSR250Activator.java&r1=697612&r2=697613&rev=697613&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JSR250Activator.java
(original)
+++
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/JSR250Activator.java
Sun Sep 21 14:18:25 2008
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.tuscany.sca.implementation.java.impl;
+package org.apache.tuscany.sca.policy.jsr250;
import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.ModuleActivator;
import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import
org.apache.tuscany.sca.implementation.java.introspect.impl.JSR250PolicyProcessor;
import org.apache.tuscany.sca.policy.PolicyFactory;
+import
org.apache.tuscany.sca.policy.jsr250.introspect.impl.JSR250PolicyProcessor;
/**
* A module activator for the Java implementation model.
Copied:
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/JSR250PolicyProcessor.java
(from r697612,
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JSR250PolicyProcessor.java)
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/JSR250PolicyProcessor.java?p2=tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/JSR250PolicyProcessor.java&p1=tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JSR250PolicyProcessor.java&r1=697612&r2=697613&rev=697613&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JSR250PolicyProcessor.java
(original)
+++
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/JSR250PolicyProcessor.java
Sun Sep 21 14:18:25 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.sca.implementation.java.introspect.impl;
+package org.apache.tuscany.sca.policy.jsr250.introspect.impl;
import java.lang.reflect.Method;
@@ -31,6 +31,7 @@
import org.apache.tuscany.sca.assembly.OperationsConfigurator;
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;
import org.apache.tuscany.sca.policy.PolicyFactory;
import org.apache.tuscany.sca.policy.PolicySet;
import org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy;
Modified:
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator?rev=697613&r1=697612&r2=697613&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
(original)
+++
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
Sun Sep 21 14:18:25 2008
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-org.apache.tuscany.sca.implementation.java.impl.JSR250Activator
+org.apache.tuscany.sca.policy.jsr250.JSR250Activator
Copied:
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java
(from r697612,
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCaseFIXME.java)
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java?p2=tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java&p1=tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCaseFIXME.java&r1=697612&r2=697613&rev=697613&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCaseFIXME.java
(original)
+++
tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java
Sun Sep 21 14:18:25 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.sca.implementation.java.introspect.impl;
+package org.apache.tuscany.sca.policy.jsr250.introspect.impl;
import java.lang.reflect.Method;
import java.util.HashMap;
@@ -31,12 +31,14 @@
import
org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory;
import org.apache.tuscany.sca.implementation.java.JavaImplementation;
import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
+import
org.apache.tuscany.sca.implementation.java.introspect.impl.ServiceProcessor;
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;
+import
org.apache.tuscany.sca.policy.jsr250.introspect.impl.JSR250PolicyProcessor;
import org.osoa.sca.annotations.Requires;
import org.osoa.sca.annotations.Service;
