Author: rfeng
Date: Mon Apr 21 16:24:18 2008
New Revision: 650312
URL: http://svn.apache.org/viewvc?rev=650312&view=rev
Log:
Remove the Assertion suffix
Added:
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AllowPolicy.java
- copied, changed from r650179,
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AllowPolicyAssertion.java
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AllowPolicyProcessor.java
- copied, changed from r650179,
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AllowPolicyAssertionProcessor.java
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AuthorizationPolicy.java
- copied, changed from r650179,
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AuthorizationPolicyAssertion.java
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/DenyAllPolicy.java
- copied, changed from r650179,
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/DenyAllPolicyAssertion.java
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/DenyAllPolicyProcessor.java
- copied, changed from r650179,
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/DenyAllPolicyAssertionProcessor.java
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/PermitAllPolicy.java
- copied, changed from r650179,
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/PermitAllPolicyAssertion.java
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/PermitAllPolicyProcessor.java
- copied, changed from r650179,
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/PermitAllPolicyAssertionProcessor.java
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/RunAsPolicy.java
- copied, changed from r650179,
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/RunAsPolicyAssertion.java
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/RunAsPolicyProcessor.java
- copied, changed from r650179,
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/RunAsPolicyAssertionProcessor.java
Removed:
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AllowPolicyAssertion.java
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AllowPolicyAssertionProcessor.java
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AuthorizationPolicyAssertion.java
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/DenyAllPolicyAssertion.java
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/DenyAllPolicyAssertionProcessor.java
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/PermitAllPolicyAssertion.java
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/PermitAllPolicyAssertionProcessor.java
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/RunAsPolicyAssertion.java
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/RunAsPolicyAssertionProcessor.java
Modified:
incubator/tuscany/java/sca/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
incubator/tuscany/java/sca/modules/policy-security/src/main/resources/policy_definitions.xml
Copied:
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AllowPolicy.java
(from r650179,
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AllowPolicyAssertion.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AllowPolicy.java?p2=incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AllowPolicy.java&p1=incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AllowPolicyAssertion.java&r1=650179&r2=650312&rev=650312&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AllowPolicyAssertion.java
(original)
+++
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AllowPolicy.java
Mon Apr 21 16:24:18 2008
@@ -28,11 +28,11 @@
*
* @version $Rev$ $Date$
*/
-public class AllowPolicyAssertion extends AuthorizationPolicyAssertion {
+public class AllowPolicy extends AuthorizationPolicy {
public static final QName NAME = new QName(Constants.SCA10_NS, "allow");
- public AllowPolicyAssertion() {
- super(ACCESS_LEVEL.ALLOW);
+ public AllowPolicy() {
+ super(AcessControl.ALLOW);
}
public QName getSchemaName() {
Copied:
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AllowPolicyProcessor.java
(from r650179,
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AllowPolicyAssertionProcessor.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AllowPolicyProcessor.java?p2=incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AllowPolicyProcessor.java&p1=incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AllowPolicyAssertionProcessor.java&r1=650179&r2=650312&rev=650312&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AllowPolicyAssertionProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AllowPolicyProcessor.java
Mon Apr 21 16:24:18 2008
@@ -38,20 +38,20 @@
import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-public class AllowPolicyAssertionProcessor implements
StAXArtifactProcessor<AllowPolicyAssertion> {
- private static final QName ALLOW_AUTHORIZATION_POLICY_QNAME =
AllowPolicyAssertion.NAME;
+public class AllowPolicyProcessor implements
StAXArtifactProcessor<AllowPolicy> {
+ private static final QName ALLOW_AUTHORIZATION_POLICY_QNAME =
AllowPolicy.NAME;
private static final String ROLES = "roles";
public QName getArtifactType() {
return ALLOW_AUTHORIZATION_POLICY_QNAME;
}
- public AllowPolicyAssertionProcessor(ModelFactoryExtensionPoint
modelFactories) {
+ public AllowPolicyProcessor(ModelFactoryExtensionPoint modelFactories) {
}
- public AllowPolicyAssertion read(XMLStreamReader reader) throws
ContributionReadException, XMLStreamException {
- AllowPolicyAssertion policy = new AllowPolicyAssertion();
+ public AllowPolicy read(XMLStreamReader reader) throws
ContributionReadException, XMLStreamException {
+ AllowPolicy policy = new AllowPolicy();
int event = reader.getEventType();
QName name = null;
@@ -79,7 +79,7 @@
return policy;
}
- public void write(AllowPolicyAssertion policy, XMLStreamWriter writer)
throws ContributionWriteException,
+ public void write(AllowPolicy policy, XMLStreamWriter writer) throws
ContributionWriteException,
XMLStreamException {
writer.writeStartElement(ALLOW_AUTHORIZATION_POLICY_QNAME.getLocalPart());
@@ -95,11 +95,11 @@
writer.writeEndElement();
}
- public Class<AllowPolicyAssertion> getModelType() {
- return AllowPolicyAssertion.class;
+ public Class<AllowPolicy> getModelType() {
+ return AllowPolicy.class;
}
- public void resolve(AllowPolicyAssertion policy, ModelResolver resolver)
throws ContributionResolveException {
+ public void resolve(AllowPolicy policy, ModelResolver resolver) throws
ContributionResolveException {
//right now nothing to resolve
policy.setUnresolved(false);
}
Copied:
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AuthorizationPolicy.java
(from r650179,
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AuthorizationPolicyAssertion.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AuthorizationPolicy.java?p2=incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AuthorizationPolicy.java&p1=incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AuthorizationPolicyAssertion.java&r1=650179&r2=650312&rev=650312&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AuthorizationPolicyAssertion.java
(original)
+++
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/AuthorizationPolicy.java
Mon Apr 21 16:24:18 2008
@@ -29,36 +29,34 @@
*
* @version $Rev$ $Date$
*/
-public abstract class AuthorizationPolicyAssertion implements Policy {
+public abstract class AuthorizationPolicy implements Policy {
private List<String> roleNames = null;
-
- public enum ACCESS_LEVEL { PERMIT_ALL,
- DENY_ALL,
- ALLOW };
-
- public AuthorizationPolicyAssertion(ACCESS_LEVEL accessLevel) {
+
+ public enum AcessControl {
+ PERMIT_ALL, DENY_ALL, ALLOW
+ };
+
+ public AuthorizationPolicy(AcessControl accessLevel) {
this.accessLevel = accessLevel;
}
-
- private ACCESS_LEVEL accessLevel;
+ private AcessControl accessLevel;
- public ACCESS_LEVEL getAccessLevel() {
+ public AcessControl getAccessLevel() {
return accessLevel;
}
- public void setAccessLevel(ACCESS_LEVEL accessLevel) {
+ public void setAccessLevel(AcessControl accessLevel) {
this.accessLevel = accessLevel;
}
public List<String> getRoleNames() {
- if ( accessLevel == ACCESS_LEVEL.ALLOW &&
- roleNames == null ) {
+ if (accessLevel == AcessControl.ALLOW && roleNames == null) {
roleNames = new ArrayList<String>();
}
return roleNames;
- }
-
+ }
+
public boolean isUnresolved() {
return false;
}
Copied:
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/DenyAllPolicy.java
(from r650179,
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/DenyAllPolicyAssertion.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/DenyAllPolicy.java?p2=incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/DenyAllPolicy.java&p1=incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/DenyAllPolicyAssertion.java&r1=650179&r2=650312&rev=650312&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/DenyAllPolicyAssertion.java
(original)
+++
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/DenyAllPolicy.java
Mon Apr 21 16:24:18 2008
@@ -28,11 +28,11 @@
*
* @version $Rev$ $Date$
*/
-public class DenyAllPolicyAssertion extends AuthorizationPolicyAssertion {
+public class DenyAllPolicy extends AuthorizationPolicy {
public static final QName NAME = new QName(Constants.SCA10_NS, "denyAll");
- public DenyAllPolicyAssertion() {
- super(ACCESS_LEVEL.DENY_ALL);
+ public DenyAllPolicy() {
+ super(AcessControl.DENY_ALL);
}
public QName getSchemaName() {
Copied:
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/DenyAllPolicyProcessor.java
(from r650179,
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/DenyAllPolicyAssertionProcessor.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/DenyAllPolicyProcessor.java?p2=incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/DenyAllPolicyProcessor.java&p1=incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/DenyAllPolicyAssertionProcessor.java&r1=650179&r2=650312&rev=650312&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/DenyAllPolicyAssertionProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/DenyAllPolicyProcessor.java
Mon Apr 21 16:24:18 2008
@@ -31,33 +31,33 @@
import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-public class DenyAllPolicyAssertionProcessor implements
StAXArtifactProcessor<DenyAllPolicyAssertion> {
- private static final QName DENY_ALL_AUTHORIZATION_POLICY_QNAME =
DenyAllPolicyAssertion.NAME;
+public class DenyAllPolicyProcessor implements
StAXArtifactProcessor<DenyAllPolicy> {
+ private static final QName DENY_ALL_AUTHORIZATION_POLICY_QNAME =
DenyAllPolicy.NAME;
public QName getArtifactType() {
return DENY_ALL_AUTHORIZATION_POLICY_QNAME;
}
- public DenyAllPolicyAssertionProcessor(ModelFactoryExtensionPoint
modelFactories) {
+ public DenyAllPolicyProcessor(ModelFactoryExtensionPoint modelFactories) {
}
- public DenyAllPolicyAssertion read(XMLStreamReader reader) throws
ContributionReadException, XMLStreamException {
- DenyAllPolicyAssertion policy = new DenyAllPolicyAssertion();
+ public DenyAllPolicy read(XMLStreamReader reader) throws
ContributionReadException, XMLStreamException {
+ DenyAllPolicy policy = new DenyAllPolicy();
return policy;
}
- public void write(DenyAllPolicyAssertion policy, XMLStreamWriter writer)
throws ContributionWriteException,
+ public void write(DenyAllPolicy policy, XMLStreamWriter writer) throws
ContributionWriteException,
XMLStreamException {
writer.writeStartElement(DENY_ALL_AUTHORIZATION_POLICY_QNAME.getLocalPart());
writer.writeEndElement();
}
- public Class<DenyAllPolicyAssertion> getModelType() {
- return DenyAllPolicyAssertion.class;
+ public Class<DenyAllPolicy> getModelType() {
+ return DenyAllPolicy.class;
}
- public void resolve(DenyAllPolicyAssertion policy, ModelResolver resolver)
throws ContributionResolveException {
+ public void resolve(DenyAllPolicy policy, ModelResolver resolver) throws
ContributionResolveException {
//right now nothing to resolve
policy.setUnresolved(false);
}
Copied:
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/PermitAllPolicy.java
(from r650179,
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/PermitAllPolicyAssertion.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/PermitAllPolicy.java?p2=incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/PermitAllPolicy.java&p1=incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/PermitAllPolicyAssertion.java&r1=650179&r2=650312&rev=650312&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/PermitAllPolicyAssertion.java
(original)
+++
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/PermitAllPolicy.java
Mon Apr 21 16:24:18 2008
@@ -28,11 +28,11 @@
*
* @version $Rev$ $Date$
*/
-public class PermitAllPolicyAssertion extends AuthorizationPolicyAssertion {
+public class PermitAllPolicy extends AuthorizationPolicy {
public static final QName NAME = new QName(Constants.SCA10_NS,
"permitAll");
- public PermitAllPolicyAssertion() {
- super(ACCESS_LEVEL.PERMIT_ALL);
+ public PermitAllPolicy() {
+ super(AcessControl.PERMIT_ALL);
}
public QName getSchemaName() {
Copied:
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/PermitAllPolicyProcessor.java
(from r650179,
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/PermitAllPolicyAssertionProcessor.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/PermitAllPolicyProcessor.java?p2=incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/PermitAllPolicyProcessor.java&p1=incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/PermitAllPolicyAssertionProcessor.java&r1=650179&r2=650312&rev=650312&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/PermitAllPolicyAssertionProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/PermitAllPolicyProcessor.java
Mon Apr 21 16:24:18 2008
@@ -31,33 +31,33 @@
import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-public class PermitAllPolicyAssertionProcessor implements
StAXArtifactProcessor<PermitAllPolicyAssertion> {
- private static final QName PERMIT_ALL_AUTHORIZATION_POLICY_QNAME =
PermitAllPolicyAssertion.NAME;
+public class PermitAllPolicyProcessor implements
StAXArtifactProcessor<PermitAllPolicy> {
+ private static final QName PERMIT_ALL_AUTHORIZATION_POLICY_QNAME =
PermitAllPolicy.NAME;
public QName getArtifactType() {
return PERMIT_ALL_AUTHORIZATION_POLICY_QNAME;
}
- public PermitAllPolicyAssertionProcessor(ModelFactoryExtensionPoint
modelFactories) {
+ public PermitAllPolicyProcessor(ModelFactoryExtensionPoint modelFactories)
{
}
- public PermitAllPolicyAssertion read(XMLStreamReader reader) throws
ContributionReadException, XMLStreamException {
- PermitAllPolicyAssertion policy = new PermitAllPolicyAssertion();
+ public PermitAllPolicy read(XMLStreamReader reader) throws
ContributionReadException, XMLStreamException {
+ PermitAllPolicy policy = new PermitAllPolicy();
return policy;
}
- public void write(PermitAllPolicyAssertion policy, XMLStreamWriter writer)
throws ContributionWriteException,
+ public void write(PermitAllPolicy policy, XMLStreamWriter writer) throws
ContributionWriteException,
XMLStreamException {
writer.writeStartElement(PERMIT_ALL_AUTHORIZATION_POLICY_QNAME.getLocalPart());
writer.writeEndElement();
}
- public Class<PermitAllPolicyAssertion> getModelType() {
- return PermitAllPolicyAssertion.class;
+ public Class<PermitAllPolicy> getModelType() {
+ return PermitAllPolicy.class;
}
- public void resolve(PermitAllPolicyAssertion policy, ModelResolver
resolver) throws ContributionResolveException {
+ public void resolve(PermitAllPolicy policy, ModelResolver resolver) throws
ContributionResolveException {
//right now nothing to resolve
policy.setUnresolved(false);
}
Copied:
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/RunAsPolicy.java
(from r650179,
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/RunAsPolicyAssertion.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/RunAsPolicy.java?p2=incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/RunAsPolicy.java&p1=incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/RunAsPolicyAssertion.java&r1=650179&r2=650312&rev=650312&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/RunAsPolicyAssertion.java
(original)
+++
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/RunAsPolicy.java
Mon Apr 21 16:24:18 2008
@@ -29,7 +29,7 @@
*
* @version $Rev$ $Date$
*/
-public class RunAsPolicyAssertion implements Policy {
+public class RunAsPolicy implements Policy {
private String role = null;
private boolean unResolved = false;
Copied:
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/RunAsPolicyProcessor.java
(from r650179,
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/RunAsPolicyAssertionProcessor.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/RunAsPolicyProcessor.java?p2=incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/RunAsPolicyProcessor.java&p1=incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/RunAsPolicyAssertionProcessor.java&r1=650179&r2=650312&rev=650312&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/RunAsPolicyAssertionProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/RunAsPolicyProcessor.java
Mon Apr 21 16:24:18 2008
@@ -33,20 +33,20 @@
import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-public class RunAsPolicyAssertionProcessor implements
StAXArtifactProcessor<RunAsPolicyAssertion> {
- private static final QName RUNAS_AUTHORIZATION_POLICY_QNAME =
RunAsPolicyAssertion.NAME;
+public class RunAsPolicyProcessor implements
StAXArtifactProcessor<RunAsPolicy> {
+ private static final QName RUNAS_AUTHORIZATION_POLICY_QNAME =
RunAsPolicy.NAME;
private static final String ROLE = "role";
public QName getArtifactType() {
return RUNAS_AUTHORIZATION_POLICY_QNAME;
}
- public RunAsPolicyAssertionProcessor(ModelFactoryExtensionPoint
modelFactories) {
+ public RunAsPolicyProcessor(ModelFactoryExtensionPoint modelFactories) {
}
- public RunAsPolicyAssertion read(XMLStreamReader reader) throws
ContributionReadException, XMLStreamException {
- RunAsPolicyAssertion policy = new RunAsPolicyAssertion();
+ public RunAsPolicy read(XMLStreamReader reader) throws
ContributionReadException, XMLStreamException {
+ RunAsPolicy policy = new RunAsPolicy();
int event = reader.getEventType();
QName name = null;
@@ -71,18 +71,18 @@
return policy;
}
- public void write(RunAsPolicyAssertion policy, XMLStreamWriter writer)
throws ContributionWriteException,
+ public void write(RunAsPolicy policy, XMLStreamWriter writer) throws
ContributionWriteException,
XMLStreamException {
writer.writeStartElement(RUNAS_AUTHORIZATION_POLICY_QNAME.getLocalPart());
writer.writeAttribute(ROLE, policy.getRole());
writer.writeEndElement();
}
- public Class<RunAsPolicyAssertion> getModelType() {
- return RunAsPolicyAssertion.class;
+ public Class<RunAsPolicy> getModelType() {
+ return RunAsPolicy.class;
}
- public void resolve(RunAsPolicyAssertion policy, ModelResolver resolver)
throws ContributionResolveException {
+ public void resolve(RunAsPolicy policy, ModelResolver resolver) throws
ContributionResolveException {
//right now nothing to resolve
policy.setUnresolved(false);
}
Modified:
incubator/tuscany/java/sca/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=650312&r1=650311&r2=650312&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
(original)
+++
incubator/tuscany/java/sca/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
Mon Apr 21 16:24:18 2008
@@ -16,9 +16,9 @@
# under the License.
# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.policy.security.PermitAllPolicyAssertionProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#permitAll,model=org.apache.tuscany.sca.policy.security.PermitAllPolicyAssertion
-org.apache.tuscany.sca.policy.security.DenyAllPolicyAssertionProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#denyAll,model=org.apache.tuscany.sca.policy.security.DenyAllPolicyAssertion
-org.apache.tuscany.sca.policy.security.AllowPolicyAssertionProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#allow,model=org.apache.tuscany.sca.policy.security.AllowPolicyAssertion
-org.apache.tuscany.sca.policy.security.RunAsPolicyAssertionProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#runAs,model=org.apache.tuscany.sca.policy.security.RunAsPolicyAssertion
+org.apache.tuscany.sca.policy.security.PermitAllPolicyProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#permitAll,model=org.apache.tuscany.sca.policy.security.PermitAllPolicy
+org.apache.tuscany.sca.policy.security.DenyAllPolicyProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#denyAll,model=org.apache.tuscany.sca.policy.security.DenyAllPolicy
+org.apache.tuscany.sca.policy.security.AllowPolicyProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#allow,model=org.apache.tuscany.sca.policy.security.AllowPolicy
+org.apache.tuscany.sca.policy.security.RunAsPolicyProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#runAs,model=org.apache.tuscany.sca.policy.security.RunAsPolicy
org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#wsConfigParam,model=org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicy
org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#jaasAuthentication,model=org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicy
Modified:
incubator/tuscany/java/sca/modules/policy-security/src/main/resources/policy_definitions.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-security/src/main/resources/policy_definitions.xml?rev=650312&r1=650311&r2=650312&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/policy-security/src/main/resources/policy_definitions.xml
(original)
+++
incubator/tuscany/java/sca/modules/policy-security/src/main/resources/policy_definitions.xml
Mon Apr 21 16:24:18 2008
@@ -132,7 +132,7 @@
<policySet name="ConfidentialityPolicies"
provides="confidentiality"
- bindings="binding.ws"
+ appliesTo="binding.ws"
xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
<intentMap provides="confidentiality" default="transport">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
