diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-09-21 21:18:25 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-09-21 21:18:25 +0000 |
commit | f288aca4678629132b0ce7a23c8ce8f102792d74 (patch) | |
tree | 4a2482086faab5b70bfad4ac3569274cc371265c /branches | |
parent | ec0b3d5c113349e89336855bd8f172b8afaa5439 (diff) |
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.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@697613 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
5 files changed, 10 insertions, 7 deletions
diff --git a/branches/sca-equinox/modules/policy-security-jsr250/pom.xml b/branches/sca-equinox/modules/policy-security-jsr250/pom.xml index 467742f575..edbb3d1648 100644 --- a/branches/sca-equinox/modules/policy-security-jsr250/pom.xml +++ b/branches/sca-equinox/modules/policy-security-jsr250/pom.xml @@ -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> diff --git a/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JSR250Activator.java b/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/JSR250Activator.java index befe398129..0c5a6dd040 100644 --- a/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JSR250Activator.java +++ b/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/JSR250Activator.java @@ -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. diff --git a/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JSR250PolicyProcessor.java b/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/JSR250PolicyProcessor.java index f639bc679f..2622886075 100644 --- a/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JSR250PolicyProcessor.java +++ b/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/JSR250PolicyProcessor.java @@ -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.ConfiguredOperation; 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; diff --git a/branches/sca-equinox/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/branches/sca-equinox/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator index 550e6d3708..5feb961dc2 100644 --- a/branches/sca-equinox/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator +++ b/branches/sca-equinox/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator @@ -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
diff --git a/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCaseFIXME.java b/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java index 894117354e..fc5d862449 100644 --- a/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCaseFIXME.java +++ b/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java @@ -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.assembly.OperationsConfigurator; 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; |