Delete previous 1.5 branch thats now old and unused and will be replaced with the current 1.x trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@775435 13f79535-47bb-0310-9956-ffa450edef68

15 files changed, 0 insertions, 1317 deletions

diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/authentication/AuthenticationConfigurationPolicy.java b/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/authentication/AuthenticationConfigurationPolicy.java
deleted file mode 100644
index 4ab7e582ac..0000000000
--- a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/authentication/AuthenticationConfigurationPolicy.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.policy.authentication;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.host.http.UserContext;
-
-/**
- * This policy configures authentication/authorization
- * in embedded http servers
- * 
- * @version $Rev$ $Date$
- */
-public class AuthenticationConfigurationPolicy {
-    public static final QName NAME = new QName(Constants.SCA10_TUSCANY_NS, "basicAuthenticationConfiguration");
-    
-    private List<UserContext> users = new ArrayList<UserContext>();
-    
-    public List<UserContext> getUsers() {
-        return this.users;
-    }
-    
-}
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/authentication/AuthenticationConfigurationPolicyProcessor.java b/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/authentication/AuthenticationConfigurationPolicyProcessor.java
deleted file mode 100644
index b45b8a4275..0000000000
--- a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/authentication/AuthenticationConfigurationPolicyProcessor.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * 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.policy.authentication;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import java.util.StringTokenizer;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.host.http.UserContext;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- *  <sca:policySet name="widgetBindingAuthenticationPolicySet"
- *       provides="sca:authentication"
- *       appliesTo="tuscany:binding.http">
- *       <tuscany:authenticationConfiguration>
- *            <tuscany:user username="user1" password="tuscany" roles="admin"/>
- *            <tuscany:user username="user2" password="tuscany" roles="admin, user"/>
- *            <tuscany:user username="user3" password="tuscany" roles="user"/>
- *       </tuscany:authenticationConfiguration>
- *  </sca:policySet>
- *
- *
- * @version $Rev$ $Date$
- */
-
-public class AuthenticationConfigurationPolicyProcessor implements StAXArtifactProcessor<AuthenticationConfigurationPolicy> {
-    private static final QName AUTHENTICATION_CONFIGURATION_QNAME = new QName(Constants.SCA10_TUSCANY_NS, "authenticationConfiguration");
-    private static final QName USER_QNAME = new QName(Constants.SCA10_TUSCANY_NS, "user");
-
-    private Monitor monitor;
-    
-    public AuthenticationConfigurationPolicyProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem = new ProblemImpl(this.getClass().getName(), "policy-security-http-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }        
-    }    
-    
-    public QName getArtifactType() {
-        return AuthenticationConfigurationPolicy.NAME;
-    }
-
-    public Class<AuthenticationConfigurationPolicy> getModelType() {
-        return AuthenticationConfigurationPolicy.class;
-    }
-
-    public AuthenticationConfigurationPolicy read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        AuthenticationConfigurationPolicy authenticationConfiguration = new AuthenticationConfigurationPolicy();
-        
-        int event = reader.getEventType();
-        QName start = reader.getName();
-        QName name = null;
-        while (true) {
-            switch (event) {
-                case START_ELEMENT:
-                    name = reader.getName();
-                    if(USER_QNAME.equals(name)) {
-                        UserContext user = new UserContext();
-                        //<tuscany:user username="user1" password="tuscany" roles="admin, user"/>
-                        String username = reader.getAttributeValue(null, "username");
-                        if(username == null) {
-                            error("RequiredAttributeUsernameMissing", reader);
-                        } else {
-                            user.setUsername(username);    
-                        }
-                        
-                        String password = reader.getAttributeValue(null, "password");
-                        if(password == null) {
-                            error("RequiredAttributePasswordMissing", reader);
-                        } else {
-                            user.setPassword(password);
-                        }
-                        
-                        String roles = reader.getAttributeValue(null, "roles");
-                        if(roles == null) {
-                            error("RequiredAttributeRolesMissing", reader);
-                        } else {
-                            for (StringTokenizer tokens = new StringTokenizer(roles, ","); tokens.hasMoreTokens();) {
-                                user.getRoles().add(tokens.nextToken());    
-                            }
-                        }
-                        
-                        authenticationConfiguration.getUsers().add(user);
-                    }
-                    break;
-                case END_ELEMENT:
-                    if (start.equals(reader.getName())) {
-                        if (reader.hasNext()) {
-                            reader.next();
-                        }
-                        return authenticationConfiguration;
-                    }
-
-            }
-            if (reader.hasNext()) {
-                event = reader.next();
-            } else {
-                return authenticationConfiguration;
-            }
-        }    
-    }
-
-    public void write(AuthenticationConfigurationPolicy model, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        // TODO Auto-generated method stub
-    }
-
-    public void resolve(AuthenticationConfigurationPolicy model, ModelResolver resolver) throws ContributionResolveException {
-
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicy.java b/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicy.java
deleted file mode 100644
index 5301e13269..0000000000
--- a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicy.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * 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.policy.confidentiality;
-
-import java.util.Properties;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.policy.Policy;
-
-
-/**
- * Models the SCA Implementation Security Policy Assertion for Confidentiality.
- * 
- * This would map to enabling SSL communication and would require 
- * the following configuration items :
- * 
- * - javax.net.ssl.keyStore
- * - javax.net.ssl.keyStorePassword
- * - javax.net.ssl.keyStoreType
- *
- * - javax.net.ssl.trustStoreType
- * - javax.net.ssl.trustStore
- * - javax.net.ssl.trustStorePassword
- * 
- * @version $Rev$ $Date$
- */
-public class ConfidentialityPolicy implements Policy {
-    public static final QName NAME = new QName(Constants.SCA10_TUSCANY_NS, "confidentiality");
-
-    private String trustStoreType;
-    private String trustStore;
-    private String trustStorePassword;
-    
-    private String keyStoreType;
-    private String keyStore;
-    private String keyStorePassword;
-    
-    
-    public String getTrustStoreType() {
-        return trustStoreType;
-    }
-
-    public void setTrustStoreType(String trustStoreType) {
-        this.trustStoreType = trustStoreType;
-    }
-    
-    public String getTrustStore() {
-        return trustStore;
-    }
-
-    public void setTrustStore(String trustStore) {
-        this.trustStore = trustStore;
-    }
-
-    public String getTrustStorePassword() {
-        return trustStorePassword;
-    }
-
-    public void setTrustStorePassword(String trustStorePassword) {
-        this.trustStorePassword = trustStorePassword;
-    }
-
-    public String getKeyStoreType() {
-        return keyStoreType;
-    }
-
-    public void setKeyStoreType(String keyStoreType) {
-        this.keyStoreType = keyStoreType;
-    }
-    
-    public String getKeyStore() {
-        return keyStore;
-    }
-
-    public void setKeyStore(String keyStore) {
-        this.keyStore = keyStore;
-    }
-
-    public String getKeyStorePassword() {
-        return keyStorePassword;
-    }
-
-    public void setKeyStorePassword(String keyStorePassword) {
-        this.keyStorePassword = keyStorePassword;
-    }
-
-    public QName getSchemaName() {
-        return NAME;
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        
-    }
-    
-    public Properties toProperties() {
-        Properties properties = new Properties();
-        
-        properties.put("javax.net.ssl.trustStoreType", trustStoreType);
-        properties.put("javax.net.ssl.trustStore", trustStore);
-        properties.put("javax.net.ssl.trustStorePassword", trustStorePassword);
-        
-        properties.put("javax.net.ssl.keyStoreType", keyStoreType);
-        properties.put("javax.net.ssl.keyStore", keyStore);
-        properties.put("javax.net.ssl.keyStorePassword", keyStorePassword);
-        
-        return properties;
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicyProcessor.java b/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicyProcessor.java
deleted file mode 100644
index 972700bdce..0000000000
--- a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicyProcessor.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * 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.policy.confidentiality;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-public class ConfidentialityPolicyProcessor implements StAXArtifactProcessor<ConfidentialityPolicy> {
-    private static final QName KEY_STORE_QNAME = new QName(Constants.SCA10_TUSCANY_NS, "keyStore");
-    private static final QName TRUST_STORE_QNAME = new QName(Constants.SCA10_TUSCANY_NS, "trustStore");
-
-    private Monitor monitor;
-    
-    public ConfidentialityPolicyProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem = new ProblemImpl(this.getClass().getName(), "policy-security-http-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }        
-    }    
-    
-    public QName getArtifactType() {
-        return ConfidentialityPolicy.NAME;
-    }
-
-    public Class<ConfidentialityPolicy> getModelType() {
-        return ConfidentialityPolicy.class;
-    }
-
-    public ConfidentialityPolicy read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        ConfidentialityPolicy policy = new ConfidentialityPolicy();
-        int event = reader.getEventType();
-        QName start = reader.getName();
-        QName name = null;
-        while (true) {
-            switch (event) {
-                case START_ELEMENT:
-                    name = reader.getName();
-                    if(KEY_STORE_QNAME.equals(name)) {
-                        //<tuscany:keyStore type="JKS" file="conf/tomcat.keystore" password="apache"/>
-                        String type = reader.getAttributeValue(null, "type");
-                        if(type == null) {
-                            error("RequiredAttributeKeyStoreTypeMissing", reader);
-                        } else {
-                            policy.setKeyStoreType(type);    
-                        }
-                        
-                        String file = reader.getAttributeValue(null, "file");
-                        if(file == null) {
-                            error("RequiredAttributeKeyStoreFileMissing", reader);
-                        } else {
-                            policy.setKeyStore(file);
-                        }
-                        
-                        String password = reader.getAttributeValue(null, "password");
-                        if(file == null) {
-                            error("RequiredAttributeKeyStorePasswordMissing", reader);
-                        } else {
-                            policy.setKeyStorePassword(password);
-                        }
-                        
-                    } else if(TRUST_STORE_QNAME.equals(name)) {
-                        //<tuscany:trustStore type="" file="" password=""/>
-                        String type = reader.getAttributeValue(null, "type");
-                        if(type == null) {
-                            error("RequiredAttributeTrustStoreTypeMissing", reader);
-                        } else {
-                            policy.setTrustStoreType(type);    
-                        }
-                        
-                        String file = reader.getAttributeValue(null, "file");
-                        if(file == null) {
-                            error("RequiredAttributeTrusStoreFileMissing", reader);
-                        } else {
-                            policy.setTrustStore(file);
-                        }
-                        
-                        String password = reader.getAttributeValue(null, "password");
-                        if(file == null) {
-                            error("RequiredAttributeTrustStorePasswordMissing", reader);
-                        } else {
-                            policy.setTrustStorePassword(password);
-                        }
-
-                    }
-                    break;
-                case END_ELEMENT:
-                    if (start.equals(reader.getName())) {
-                        if (reader.hasNext()) {
-                            reader.next();
-                        }
-                        return policy;
-                    }
-
-            }
-            if (reader.hasNext()) {
-                event = reader.next();
-            } else {
-                return policy;
-            }
-        }    }
-
-    public void write(ConfidentialityPolicy model, XMLStreamWriter writer) throws ContributionWriteException,
-        XMLStreamException {
-        // TODO Auto-generated method stub
-
-    }
-
-    public void resolve(ConfidentialityPolicy model, ModelResolver resolver) throws ContributionResolveException {
-
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationCallbackHandler.java b/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationCallbackHandler.java
deleted file mode 100644
index 00453a213b..0000000000
--- a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationCallbackHandler.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.policy.security.http;
-
-import java.io.IOException;
-
-import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-
-import org.apache.tuscany.sca.policy.SecurityUtil;
-import org.apache.tuscany.sca.policy.authentication.basic.BasicAuthenticationPrincipal;
-
-
-/**
- * @version $Rev$ $Date$
- */
-public class LDAPRealmAuthenticationCallbackHandler implements CallbackHandler {
-    private final Subject subject;
-    
-    public LDAPRealmAuthenticationCallbackHandler(Subject subject) {
-        this.subject = subject;
-    }
-    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-
-        BasicAuthenticationPrincipal principal =  SecurityUtil.getPrincipal(subject, BasicAuthenticationPrincipal.class);
-
-        if (principal != null){
-            System.out.println(">>> LDAPRealmAuthenticationCallbackHandler" +
-                               " Username: " + principal.getName() + 
-                               " Password: " + principal.getPassword());
-            
-            for (int i = 0; i < callbacks.length; i++) {
-                if (callbacks[i] instanceof NameCallback) {
-                    NameCallback nc = (NameCallback)callbacks[i];
-                    nc.setName(principal.getName());
-                } else if (callbacks[i] instanceof PasswordCallback) {
-                    PasswordCallback pc = (PasswordCallback)callbacks[i];
-                    pc.setPassword(principal.getPassword().toCharArray());
-                } else {
-                    throw new UnsupportedCallbackException
-                    (callbacks[i], "Unsupported Callback!");
-                }
-            }
-        }
-        
-
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationImplementationPolicyProvider.java b/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationImplementationPolicyProvider.java
deleted file mode 100644
index 9b0ab3c8a1..0000000000
--- a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationImplementationPolicyProvider.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * 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.policy.security.http;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.ConfiguredOperation;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.OperationsConfigurator;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationInterceptor;
-import org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicy;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-public class LDAPRealmAuthenticationImplementationPolicyProvider implements PolicyProvider {
-    private RuntimeComponent component;
-    private Implementation implementation;
-
-    public LDAPRealmAuthenticationImplementationPolicyProvider(RuntimeComponent component, Implementation implementation) {
-        super();
-        this.component = component;
-        this.implementation = implementation;
-    }
-    
-
-    public String getPhase() {
-        return Phase.IMPLEMENTATION_POLICY;
-    }
-
-    public Interceptor createInterceptor(Operation operation) {
-        List<LDAPRealmAuthenticationPolicy> policies = findPolicies(operation);
-        if (policies == null || policies.isEmpty()) {
-            return null;
-        } else {
-            return new LDAPRealmAuthenticationInterceptor(findPolicies(operation));
-        }
-    }
-
-    /**
-     * Internal utility methods
-     */
-    
-    /**
-     * 
-     * @param op
-     * @return
-     */
-    private List<LDAPRealmAuthenticationPolicy> findPolicies(Operation op) {
-        List<LDAPRealmAuthenticationPolicy> polices = new ArrayList<LDAPRealmAuthenticationPolicy>();
-        // FIXME: How do we get a list of effective policySets for a given operation?
-        if (implementation instanceof OperationsConfigurator) {
-            OperationsConfigurator operationsConfigurator = (OperationsConfigurator)implementation;
-            for (ConfiguredOperation cop : operationsConfigurator.getConfiguredOperations()) {
-                if (cop.getName().equals(op.getName())) {
-                    for (PolicySet ps : cop.getPolicySets()) {
-                        for (Object p : ps.getPolicies()) {
-                            if (JaasAuthenticationPolicy.class.isInstance(p)) {
-                                polices.add((LDAPRealmAuthenticationPolicy)p);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        
-        List<PolicySet> policySets = component.getPolicySets();
-        for (PolicySet ps : policySets) {
-            for (Object p : ps.getPolicies()) {
-                if (LDAPRealmAuthenticationPolicy.class.isInstance(p)) {
-                    polices.add((LDAPRealmAuthenticationPolicy)p);
-                }
-            }
-        }
-        return polices;
-    }
-}
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationInterceptor.java b/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationInterceptor.java
deleted file mode 100644
index 787d41f584..0000000000
--- a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationInterceptor.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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.policy.security.http;
-
-import java.util.List;
-
-import javax.security.auth.Subject;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.login.LoginContext;
-
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.policy.security.http.util.HttpSecurityUtil;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * @version $Rev$ $Date$
- */
-public class LDAPRealmAuthenticationInterceptor  implements Interceptor {
-    private List<LDAPRealmAuthenticationPolicy> authenticationPolicies;
-    private Invoker next;
-
-    public LDAPRealmAuthenticationInterceptor(List<LDAPRealmAuthenticationPolicy> authenticationPolicies) {
-        super();
-        this.authenticationPolicies = authenticationPolicies;
-    }
-
-    public Invoker getNext() {
-        return next;
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-    }
-
-    public Message invoke(Message msg) {
-        try {
-            for (LDAPRealmAuthenticationPolicy policy : authenticationPolicies) {
-                Subject subject = HttpSecurityUtil.getSubject(msg);
-                CallbackHandler callbackHandler = new LDAPRealmAuthenticationCallbackHandler(subject);
-                LoginContext lc = new LoginContext(policy.getRealmConfigurationName(), callbackHandler);
-                lc.login();
-            }
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-        return getNext().invoke(msg);
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicy.java b/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicy.java
deleted file mode 100644
index ddb6790964..0000000000
--- a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicy.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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.policy.security.http;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.policy.Policy;
-
-/**
- * This policy provides realm based authentication/authorization
- * 
- * @version $Rev$ $Date$
- */
-public class LDAPRealmAuthenticationPolicy implements Policy{
-    static final QName NAME = new QName(Constants.SCA10_TUSCANY_NS,"ldapRealmAuthentication");
-
-    private String realmName;
-    private String realmConfigurationName;
-
-    /**
-     * 
-     * @return
-     */
-    public String getRealmName() {
-        return realmName;
-    }
-
-    /**
-     * 
-     * @param realmName
-     */
-    public void setRealmName(String realmName) {
-        this.realmName = realmName;
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public String getRealmConfigurationName() {
-        return realmConfigurationName;
-    }
-
-    /**
-     * 
-     * @param realmConfigurationName
-     */
-    public void setRealmConfigurationName(String realmConfigurationName) {
-        this.realmConfigurationName = realmConfigurationName;
-    }
-
-    public QName getSchemaName() {
-        return NAME;
-    }
-    
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-    }
-}
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicyProcessor.java b/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicyProcessor.java
deleted file mode 100644
index caa1a66b94..0000000000
--- a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicyProcessor.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * 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.policy.security.http;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-
-/**
- *
- * @version $Rev$ $Date$
- */
-
-public class LDAPRealmAuthenticationPolicyProcessor implements StAXArtifactProcessor<LDAPRealmAuthenticationPolicy> {
-    static final QName REALM_QNAME = new QName(Constants.SCA10_TUSCANY_NS,"realm");
-    public static final QName REALM_CONFIGURATION_QNAME = new QName(Constants.SCA10_TUSCANY_NS,"realmConfigurationName");
-    
-    private Monitor monitor;
-    
-    
-    public LDAPRealmAuthenticationPolicyProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-         if (monitor != null) {
-                 Problem problem = new ProblemImpl(this.getClass().getName(), "policy-security-http-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-             monitor.problem(problem);
-         }        
-    }
-    
-    public Class<LDAPRealmAuthenticationPolicy> getModelType() {
-        return LDAPRealmAuthenticationPolicy.class;
-    }
-    
-
-    public QName getArtifactType() {
-        return LDAPRealmAuthenticationPolicy.NAME;
-    }
-    
-    public LDAPRealmAuthenticationPolicy read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        LDAPRealmAuthenticationPolicy policy = new LDAPRealmAuthenticationPolicy();
-        int event = reader.getEventType();
-        QName name = null;
-        
-        while (reader.hasNext()) {
-            event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT : {
-                    name = reader.getName();
-                    if (name.equals(REALM_QNAME)) {
-                        String realmName = reader.getElementText();
-                        if (realmName != null) {
-                            policy.setRealmName(realmName.trim());
-                        }
-                    }
-                    if (name.equals(REALM_CONFIGURATION_QNAME)) {
-                        String realmConfigurationName = reader.getElementText();
-                        if (realmConfigurationName != null) {
-                            policy.setRealmConfigurationName(realmConfigurationName.trim());
-                        }
-                    } 
-
-                    break;
-                }
-            }
-            
-            if ( event == END_ELEMENT ) {
-                if ( LDAPRealmAuthenticationPolicy.NAME.equals(reader.getName()) ) {
-                    break;
-                } 
-            }
-            
-            //Read the next element
-            if (reader.hasNext()) {
-                reader.next();
-            }
-        }
-         
-        return policy;
-    }
-
-    public void write(LDAPRealmAuthenticationPolicy policy, XMLStreamWriter writer) throws ContributionWriteException,
-                                                        XMLStreamException {
-        String prefix = "tuscany";
-        writer.writeStartElement(prefix, 
-                                 LDAPRealmAuthenticationPolicy.NAME.getLocalPart(),
-                                 LDAPRealmAuthenticationPolicy.NAME.getNamespaceURI());
-        writer.writeNamespace("tuscany", Constants.SCA10_TUSCANY_NS);
-        
-       
-        writer.writeEndElement();
-    }
-
-
-    public void resolve(LDAPRealmAuthenticationPolicy policy, ModelResolver resolver) throws ContributionResolveException {
-
-    }
-}
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicyProviderFactory.java b/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicyProviderFactory.java
deleted file mode 100644
index ec6111a3ef..0000000000
--- a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicyProviderFactory.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.policy.security.http;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationImplementationPolicyProvider;
-import org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicy;
-import org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationServicePolicyProvider;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.PolicyProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class LDAPRealmAuthenticationPolicyProviderFactory implements PolicyProviderFactory<LDAPRealmAuthenticationPolicy> {
-
-    public LDAPRealmAuthenticationPolicyProviderFactory(ExtensionPointRegistry registry) {
-        super();
-    }
-
-    public Class<LDAPRealmAuthenticationPolicy> getModelType() {
-        return LDAPRealmAuthenticationPolicy.class;
-    }
-
-    public PolicyProvider createImplementationPolicyProvider(RuntimeComponent component, Implementation implementation) {
-        return new LDAPRealmAuthenticationImplementationPolicyProvider(component, implementation);
-    }
-
-    public PolicyProvider createReferencePolicyProvider(RuntimeComponent component,
-                                                        RuntimeComponentReference reference,
-                                                        Binding binding) {
-        return null;
-    }
-
-    public PolicyProvider createServicePolicyProvider(RuntimeComponent component,
-                                                      RuntimeComponentService service,
-                                                      Binding binding) {
-        return new LDAPRealmAuthenticationServicePolicyProvider(component, service, binding);
-    }
-
-
-}
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationServicePolicyProvider.java b/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationServicePolicyProvider.java
deleted file mode 100644
index 117e9a0009..0000000000
--- a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationServicePolicyProvider.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * 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.policy.security.http;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.ConfiguredOperation;
-import org.apache.tuscany.sca.assembly.OperationsConfigurator;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-
-/**
- * 
- * @version $Rev$ $Date$
- */
-public class LDAPRealmAuthenticationServicePolicyProvider implements PolicyProvider {
-    private RuntimeComponent component;
-    private RuntimeComponentService service;
-    private Binding binding;
-
-    private List<Operation> operations = new ArrayList<Operation>();
-    
-    public LDAPRealmAuthenticationServicePolicyProvider(RuntimeComponent component, RuntimeComponentService service, Binding binding) {
-        super();
-        this.component = component;
-        this.service = service;
-        this.binding = binding;
-        
-        this.operations.addAll(service.getInterfaceContract().getInterface().getOperations());
-    }
-
-    public String getPhase() {
-        return Phase.SERVICE_BINDING_POLICY;
-    }
-
-    public Interceptor createInterceptor(Operation operation) {
-        List<LDAPRealmAuthenticationPolicy> policies = findPolicies(operation);
-        if (policies == null || policies.isEmpty()) {
-            return null;
-        } else {
-            return new LDAPRealmAuthenticationInterceptor(policies);
-        }
-    }
-
-
-    /**
-     * Private utility methods
-     */
-    
-    /**
-     * 
-     * @param op
-     * @return
-     */
-    private List<LDAPRealmAuthenticationPolicy> findPolicies(Operation op) {
-        List<LDAPRealmAuthenticationPolicy> polices = new ArrayList<LDAPRealmAuthenticationPolicy>();
-        // FIXME: How do we get a list of effective policySets for a given operation?
-        for(Operation operation : operations) {
-            if (operation.getName().equals(op.getName())) {
-                for (PolicySet ps : operation.getPolicySets()) {
-                    for (Object p : ps.getPolicies()) {
-                        if (LDAPRealmAuthenticationPolicy.class.isInstance(p)) {
-                            polices.add((LDAPRealmAuthenticationPolicy)p);
-                        }
-                    }
-                }
-            }
-        }
-
-        if (service instanceof OperationsConfigurator) {
-            OperationsConfigurator operationsConfigurator = (OperationsConfigurator)service;
-            for (ConfiguredOperation cop : operationsConfigurator.getConfiguredOperations()) {
-                if (cop.getName().equals(op.getName())) {
-                    for (PolicySet ps : cop.getApplicablePolicySets()) {
-                        for (Object p : ps.getPolicies()) {
-                            if (LDAPRealmAuthenticationPolicy.class.isInstance(p)) {
-                                polices.add((LDAPRealmAuthenticationPolicy)p);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        List<PolicySet> policySets = service.getPolicySets();
-        for (PolicySet ps : policySets) {
-            for (Object p : ps.getPolicies()) {
-                if (LDAPRealmAuthenticationPolicy.class.isInstance(p)) {
-                    polices.add((LDAPRealmAuthenticationPolicy)p);
-                }
-            }
-        }
-        
-        return polices;
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/util/HttpSecurityUtil.java b/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/util/HttpSecurityUtil.java
deleted file mode 100644
index 88b2ee9fce..0000000000
--- a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/util/HttpSecurityUtil.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * 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.policy.security.http.util;
-
-import java.util.StringTokenizer;
-
-import javax.security.auth.Subject;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.policy.authentication.basic.BasicAuthenticationPrincipal;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class HttpSecurityUtil {
-    
-    /**
-     * Check if Authorization header is available
-     * @param request
-     * @param response
-     * @return
-     */
-    public static boolean hasAuthorizationHeader(HttpServletRequest request) {
-        boolean result = false;
-        if(request.getHeader("Authorization") != null) {
-            result = true;
-        }
-        
-        return result;
-    }   
-    
-    /**
-     * 
-     * @param request
-     * @param response
-     * @return
-     */
-    public static String getAuthorizationHeader(HttpServletRequest request) {
-        return request.getHeader("Authorization");
-    }    
-
-    public static Subject getSubject(Message msg){
-
-        Subject subject = null;
-        HttpServletRequest request = null;
-
-        for (Object header : msg.getHeaders()){
-            if (header instanceof Subject){
-                subject  = (Subject)header;
-                break;
-            } else if( header instanceof HttpServletRequest) {
-                request = (HttpServletRequest) header;
-            }
-        }
-
-        //if there is no subject, but request is available
-        //try to build a subject from authorization header
-        if (subject == null & request != null) {
-            if ( hasAuthorizationHeader(request)) {
-                subject = getSubject(getAuthorizationHeader(request));
-            }
-            
-        }
-        if (subject == null){
-            subject = new Subject(); 
-            msg.getHeaders().add(subject); 
-        }
-
-        return subject;
-
-    }
-    
-    public static Subject getSubject(String httpAuthorizationHeader){
-        
-        
-        // get the security context
-        Subject subject = new Subject();
-        String user = null;
-        String password = null;
-        
-        if (httpAuthorizationHeader != null) {
-            StringTokenizer tokens = new StringTokenizer(httpAuthorizationHeader);
-            if (tokens.hasMoreTokens()) {
-                String basic = tokens.nextToken();
-                if (basic.equalsIgnoreCase("Basic")) {
-                    String credentials = tokens.nextToken();
-                    String userAndPassword = new String(Base64.decodeBase64(credentials.getBytes()));
-                    int colon = userAndPassword.indexOf(":");
-                    if (colon != -1) {
-                        user = userAndPassword.substring(0, colon);
-                        password = userAndPassword.substring(colon + 1);
-                    }
-                }
-            }
-        }
-
-        if(user != null && password != null) {
-            BasicAuthenticationPrincipal principal = new BasicAuthenticationPrincipal(user, password);
-            subject.getPrincipals().add(principal);
-        }
-        
-        return subject;
-    }
-}
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-java-1.5/modules/policy-security-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index fd57d8a44f..0000000000
--- a/branches/sca-java-1.5/modules/policy-security-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.policy.authentication.AuthenticationConfigurationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#authenticationConfiguration,model=org.apache.tuscany.sca.policy.authentication.AuthenticationConfigurationPolicy
-org.apache.tuscany.sca.policy.confidentiality.ConfidentialityPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#confidentiality,model=org.apache.tuscany.sca.policy.confidentiality.ConfidentialityPolicy
-org.apache.tuscany.sca.policy.security.http.LDAPRealmAuthenticationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#ldapRealmAuthentication,model=org.apache.tuscany.sca.policy.security.http.LDAPRealmAuthenticationPolicy
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/branches/sca-java-1.5/modules/policy-security-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
deleted file mode 100644
index 5a92f0dfd7..0000000000
--- a/branches/sca-java-1.5/modules/policy-security-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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. 
-
-# Implementation class for the policy extension
-org.apache.tuscany.sca.policy.security.http.LDAPRealmAuthenticationPolicyProviderFactory;model=org.apache.tuscany.sca.policy.security.http.LDAPRealmAuthenticationPolicy
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/resources/policy-security-http-validation-messages.properties b/branches/sca-java-1.5/modules/policy-security-http/src/main/resources/policy-security-http-validation-messages.properties
deleted file mode 100644
index ebb47f2b60..0000000000
--- a/branches/sca-java-1.5/modules/policy-security-http/src/main/resources/policy-security-http-validation-messages.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-#
-#    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.
-#
-#
-RequiredAttributeRolesMissing = Required attribute 'roles' is missing.
-ClassNotFoundException = Class Not Found Exception: {0}
\ No newline at end of file