airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject [29/90] [abbrv] [partial] AIRAVATA-1124
Date Mon, 14 Apr 2014 18:30:31 GMT
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/security/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java
----------------------------------------------------------------------
diff --git a/modules/security/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java b/modules/security/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java
deleted file mode 100644
index d0f99ac..0000000
--- a/modules/security/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java
+++ /dev/null
@@ -1,119 +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.airavata.security.configurations;
-
-import junit.framework.TestCase;
-import org.apache.airavata.security.Authenticator;
-import org.apache.airavata.security.userstore.JDBCUserStore;
-import org.apache.airavata.security.userstore.LDAPUserStore;
-
-import java.io.File;
-import java.net.URLDecoder;
-import java.util.List;
-
-/**
- * A test class for authenticator configuration reader. Reads the authenticators.xml in resources directory.
- */
-public class AuthenticatorConfigurationReaderTest extends TestCase {
-
-    private String configurationFile = URLDecoder.decode(this.getClass().getClassLoader()
-            .getResource("authenticators.xml").getFile());
-
-    public void setUp() throws Exception {
-
-        File f = new File(".");
-        System.out.println(f.getAbsolutePath());
-
-        File file = new File(configurationFile);
-
-        if (!file.exists() && !file.canRead()) {
-            throw new Exception("Error reading configuration file " + configurationFile);
-
-        }
-    }
-
-    public void testInit() throws Exception {
-
-        AuthenticatorConfigurationReader authenticatorConfigurationReader = new AuthenticatorConfigurationReader();
-        authenticatorConfigurationReader.init(configurationFile);
-
-        assertTrue(AuthenticatorConfigurationReader.isAuthenticationEnabled());
-
-        List<Authenticator> authenticators = authenticatorConfigurationReader.getAuthenticatorList();
-
-        assertEquals(authenticators.size(), 3);
-
-        for (Authenticator authenticator : authenticators) {
-            if (authenticator instanceof TestDBAuthenticator1) {
-                assertEquals("dbAuthenticator1", authenticator.getAuthenticatorName());
-                assertEquals(6, authenticator.getPriority());
-                assertEquals(true, authenticator.isEnabled());
-                assertEquals("jdbc:sql:thin:@//myhost:1521/mysql1",
-                        ((TestDBAuthenticator1) authenticator).getDatabaseURL());
-                assertEquals("org.apache.derby.jdbc.ClientDriver", ((TestDBAuthenticator1) authenticator).getDatabaseDriver());
-                assertEquals("mysql1", ((TestDBAuthenticator1) authenticator).getDatabaseUserName());
-                assertEquals("secret1", ((TestDBAuthenticator1) authenticator).getDatabasePassword());
-                assertNotNull(authenticator.getUserStore());
-                assertTrue(authenticator.getUserStore() instanceof JDBCUserStore);
-
-                JDBCUserStore jdbcUserStore = (JDBCUserStore) authenticator.getUserStore();
-                assertEquals("MD5", jdbcUserStore.getPasswordDigester().getHashMethod());
-            } else if (authenticator instanceof TestDBAuthenticator2) {
-                assertEquals("dbAuthenticator2", authenticator.getAuthenticatorName());
-                assertEquals(7, authenticator.getPriority());
-                assertEquals(true, authenticator.isEnabled());
-                assertTrue(authenticator.getUserStore() instanceof LDAPUserStore);
-
-            } else if (authenticator instanceof TestDBAuthenticator3) {
-                assertEquals("dbAuthenticator3", authenticator.getAuthenticatorName());
-                assertEquals(8, authenticator.getPriority());
-                assertEquals(true, authenticator.isEnabled());
-                assertEquals("jdbc:sql:thin:@//myhost:1521/mysql3",
-                        ((TestDBAuthenticator3) authenticator).getDatabaseURL());
-                assertEquals("org.apache.derby.jdbc.ClientDriver", ((TestDBAuthenticator3) authenticator).getDatabaseDriver());
-                assertEquals("mysql3", ((TestDBAuthenticator3) authenticator).getDatabaseUserName());
-                assertEquals("secret3", ((TestDBAuthenticator3) authenticator).getDatabasePassword());
-                assertNotNull(authenticator.getUserStore());
-                assertTrue(authenticator.getUserStore() instanceof JDBCUserStore);
-
-            }
-        }
-
-        assertEquals(8, authenticators.get(0).getPriority());
-        assertEquals(7, authenticators.get(1).getPriority());
-        assertEquals(6, authenticators.get(2).getPriority());
-
-    }
-
-    public void testDisabledAuthenticator() throws Exception {
-
-        String disabledConfiguration = URLDecoder.decode(this.getClass().getClassLoader()
-                .getResource("disabled-authenticator.xml").getFile());
-
-        AuthenticatorConfigurationReader authenticatorConfigurationReader = new AuthenticatorConfigurationReader();
-        authenticatorConfigurationReader.init(disabledConfiguration);
-
-        assertFalse(AuthenticatorConfigurationReader.isAuthenticationEnabled());
-
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/security/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator1.java
----------------------------------------------------------------------
diff --git a/modules/security/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator1.java b/modules/security/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator1.java
deleted file mode 100644
index 00712c0..0000000
--- a/modules/security/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator1.java
+++ /dev/null
@@ -1,57 +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.airavata.security.configurations;
-
-import org.apache.airavata.security.AbstractDatabaseAuthenticator;
-import org.apache.airavata.security.AuthenticationException;
-
-public class TestDBAuthenticator1 extends AbstractDatabaseAuthenticator {
-
-    public TestDBAuthenticator1() {
-        super();
-    }
-
-    @Override
-    public void onSuccessfulAuthentication(Object authenticationInfo) {
-        // To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void onFailedAuthentication(Object authenticationInfo) {
-        // To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public boolean authenticate(Object credentials) throws AuthenticationException {
-        return false; // To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    protected boolean doAuthentication(Object credentials) throws AuthenticationException {
-        return false; // To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public boolean isAuthenticated(Object credentials) {
-        return false; // To change body of implemented methods use File | Settings | File Templates.
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/security/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator2.java
----------------------------------------------------------------------
diff --git a/modules/security/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator2.java b/modules/security/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator2.java
deleted file mode 100644
index 75f45c4..0000000
--- a/modules/security/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator2.java
+++ /dev/null
@@ -1,58 +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.airavata.security.configurations;
-
-import org.apache.airavata.security.AbstractAuthenticator;
-import org.apache.airavata.security.AuthenticationException;
-import org.w3c.dom.Node;
-
-public class TestDBAuthenticator2 extends AbstractAuthenticator {
-
-    public TestDBAuthenticator2() {
-        super();
-    }
-
-    @Override
-    protected boolean doAuthentication(Object credentials) throws AuthenticationException {
-        return false; // To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void onSuccessfulAuthentication(Object authenticationInfo) {
-        // To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void onFailedAuthentication(Object authenticationInfo) {
-        // To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public boolean isAuthenticated(Object credentials) {
-        return false; // To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void configure(Node node) throws RuntimeException {
-        // To change body of implemented methods use File | Settings | File Templates.
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/security/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator3.java
----------------------------------------------------------------------
diff --git a/modules/security/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator3.java b/modules/security/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator3.java
deleted file mode 100644
index 7523835..0000000
--- a/modules/security/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator3.java
+++ /dev/null
@@ -1,57 +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.airavata.security.configurations;
-
-import org.apache.airavata.security.AbstractDatabaseAuthenticator;
-import org.apache.airavata.security.AuthenticationException;
-
-public class TestDBAuthenticator3 extends AbstractDatabaseAuthenticator {
-
-    public TestDBAuthenticator3() {
-        super();
-    }
-
-    @Override
-    public void onSuccessfulAuthentication(Object authenticationInfo) {
-        // To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void onFailedAuthentication(Object authenticationInfo) {
-        // To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public boolean authenticate(Object credentials) throws AuthenticationException {
-        return false; // To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    protected boolean doAuthentication(Object credentials) throws AuthenticationException {
-        return false; // To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public boolean isAuthenticated(Object credentials) {
-        return false; // To change body of implemented methods use File | Settings | File Templates.
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/security/src/test/java/org/apache/airavata/security/configurations/TestUserStore.java
----------------------------------------------------------------------
diff --git a/modules/security/src/test/java/org/apache/airavata/security/configurations/TestUserStore.java b/modules/security/src/test/java/org/apache/airavata/security/configurations/TestUserStore.java
deleted file mode 100644
index a16c0ac..0000000
--- a/modules/security/src/test/java/org/apache/airavata/security/configurations/TestUserStore.java
+++ /dev/null
@@ -1,47 +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.airavata.security.configurations;
-
-import org.apache.airavata.security.UserStore;
-import org.w3c.dom.Node;
-
-/**
- * Test user store class.
- */
-public class TestUserStore implements UserStore {
-    @Override
-    public boolean authenticate(String userName, Object credentials) {
-        return false;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public boolean authenticate(Object credentials) {
-        return false;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void configure(Node node) throws RuntimeException {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/security/src/test/java/org/apache/airavata/security/userstore/JDBCUserStoreTest.java
----------------------------------------------------------------------
diff --git a/modules/security/src/test/java/org/apache/airavata/security/userstore/JDBCUserStoreTest.java b/modules/security/src/test/java/org/apache/airavata/security/userstore/JDBCUserStoreTest.java
deleted file mode 100644
index 65bb924..0000000
--- a/modules/security/src/test/java/org/apache/airavata/security/userstore/JDBCUserStoreTest.java
+++ /dev/null
@@ -1,106 +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.airavata.security.userstore;
-
-import org.apache.airavata.common.utils.DatabaseTestCases;
-import org.apache.airavata.common.utils.DerbyUtil;
-import org.apache.airavata.security.UserStore;
-import org.junit.*;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-/**
- * Test class for JDBC user store.
- */
-public class JDBCUserStoreTest extends DatabaseTestCases {
-
-    /**
-     * <specificConfigurations>
-     <database>
-     <!--jdbcUrl>jdbc:h2:modules/commons/airavata-registry-rest/src/test/resources/testdb/test</jdbcUrl-->
-     <jdbcUrl>jdbc:h2:src/test/resources/testdb/test</jdbcUrl>
-     <userName>sa</userName>
-     <password>sa</password>
-     <databaseDriver>org.h2.Driver</databaseDriver>
-     <userTableName>AIRAVATA_USER</userTableName>
-     <userNameColumnName>USERID</userNameColumnName>
-     <passwordColumnName>PASSWORD</passwordColumnName>
-     </database>
-     </specificConfigurations>
-     * @throws Exception
-     */
-
-
-    @BeforeClass
-    public static void setUpDatabase() throws Exception{
-        DerbyUtil.startDerbyInServerMode(getHostAddress(), getPort(), getUserName(), getPassword());
-
-        waitTillServerStarts();
-
-        String dropTable = "drop table AIRAVATA_USER";
-
-        try {
-            executeSQL(dropTable);
-        } catch (Exception e) {
-        }
-
-        String createTable = "create table AIRAVATA_USER ( USERID varchar(255), PASSWORD varchar(255) )";
-        executeSQL(createTable);
-
-        String insertSQL = "INSERT INTO AIRAVATA_USER VALUES('amilaj', 'secret')";
-        executeSQL(insertSQL);
-
-
-    }
-
-    @AfterClass
-    public static void shutDownDatabase() throws Exception {
-        DerbyUtil.stopDerbyServer();
-    }
-
-    @Before
-    public void setUp() throws Exception{
-    }
-
-    @Test
-    public void testAuthenticate() throws Exception {
-
-        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
-        Document doc = dBuilder.parse(this.getClass().getClassLoader().getResourceAsStream("jdbc-authenticator.xml"));
-        doc.getDocumentElement().normalize();
-
-        NodeList configurations = doc.getElementsByTagName("specificConfigurations");
-        UserStore userStore = new JDBCUserStore();
-        userStore.configure(configurations.item(0));
-
-        Assert.assertTrue(userStore.authenticate("amilaj", "secret"));
-        Assert.assertFalse(userStore.authenticate("amilaj", "1secret"));
-        Assert.assertFalse(userStore.authenticate("lahiru", "1234"));
-
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/security/src/test/java/org/apache/airavata/security/userstore/LDAPUserStoreTest.java
----------------------------------------------------------------------
diff --git a/modules/security/src/test/java/org/apache/airavata/security/userstore/LDAPUserStoreTest.java b/modules/security/src/test/java/org/apache/airavata/security/userstore/LDAPUserStoreTest.java
deleted file mode 100644
index 5749d8a..0000000
--- a/modules/security/src/test/java/org/apache/airavata/security/userstore/LDAPUserStoreTest.java
+++ /dev/null
@@ -1,69 +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.airavata.security.userstore;
-
-import junit.framework.TestCase;
-import org.apache.airavata.security.UserStore;
-import org.junit.Ignore;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-/**
- * User store test 2
- */
-@Ignore("Need LDAP server to run these tests")
-public class LDAPUserStoreTest extends TestCase{
-
-    private LDAPUserStore ldapUserStore;
-
-    public void setUp() {
-        ldapUserStore = new LDAPUserStore();
-
-        ldapUserStore.initializeLDAP("ldap://localhost:10389", "admin", "secret", "uid={0},ou=system");
-    }
-
-    public void testAuthenticate() throws Exception {
-        assertTrue(ldapUserStore.authenticate("amilaj", "secret"));
-        assertFalse(ldapUserStore.authenticate("amilaj", "secret1"));
-    }
-
-    public void testConfigure() throws Exception {
-        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
-        Document doc = dBuilder.parse(this.getClass().getClassLoader().getResourceAsStream("ldap-authenticator.xml"));
-        doc.getDocumentElement().normalize();
-
-        NodeList configurations = doc.getElementsByTagName("specificConfigurations");
-        UserStore userStore = new LDAPUserStore();
-        userStore.configure(configurations.item(0));
-
-        assertTrue(userStore.authenticate("amilaj", "secret"));
-    }
-
-
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/security/src/test/java/org/apache/airavata/security/userstore/SessionDBUserStoreTest.java
----------------------------------------------------------------------
diff --git a/modules/security/src/test/java/org/apache/airavata/security/userstore/SessionDBUserStoreTest.java b/modules/security/src/test/java/org/apache/airavata/security/userstore/SessionDBUserStoreTest.java
deleted file mode 100644
index 9059c9a..0000000
--- a/modules/security/src/test/java/org/apache/airavata/security/userstore/SessionDBUserStoreTest.java
+++ /dev/null
@@ -1,101 +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.airavata.security.userstore;
-
-import junit.framework.TestCase;
-import org.apache.airavata.common.utils.DatabaseTestCases;
-import org.apache.airavata.common.utils.DerbyUtil;
-import org.junit.*;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import java.io.File;
-import java.io.InputStream;
-
-/**
- * Test class for session DB authenticator.
- */
-
-public class SessionDBUserStoreTest extends DatabaseTestCases {
-
-    @BeforeClass
-    public static void setUpDatabase() throws Exception{
-        DerbyUtil.startDerbyInServerMode(getHostAddress(), getPort(), getUserName(), getPassword());
-
-        waitTillServerStarts();
-
-        String dropTable = "drop table Persons";
-
-        try {
-            executeSQL(dropTable);
-        } catch (Exception e) {
-        }
-
-        String createTable = "create table Persons ( sessionId varchar(255) )";
-        executeSQL(createTable);
-
-        String insertSQL = "INSERT INTO Persons VALUES('1234')";
-        executeSQL(insertSQL);
-    }
-
-    @AfterClass
-    public static void shutDownDatabase() throws Exception {
-        DerbyUtil.stopDerbyServer();
-    }
-
-    @Before
-    public void setUp() throws Exception{
-
-        loadConfigurations();
-
-    }
-
-    private SessionDBUserStore sessionDBUserStore = new SessionDBUserStore();
-
-    private InputStream configurationFileStream
-            = this.getClass().getClassLoader().getResourceAsStream("session-authenticator.xml");
-
-    private void loadConfigurations () throws Exception {
-        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
-        Document doc = dBuilder.parse(configurationFileStream);
-        doc.getDocumentElement().normalize();
-
-        NodeList specificConfigurations = doc.getElementsByTagName("specificConfigurations");
-        sessionDBUserStore.configure(specificConfigurations.item(0));
-    }
-
-    @Test
-    public void testAuthenticate() throws Exception {
-        Assert.assertTrue(sessionDBUserStore.authenticate("1234"));
-
-    }
-
-    @Test
-    public void testAuthenticateFailure() throws Exception  {
-        Assert.assertFalse(sessionDBUserStore.authenticate("12345"));
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/security/src/test/resources/authenticators.xml
----------------------------------------------------------------------
diff --git a/modules/security/src/test/resources/authenticators.xml b/modules/security/src/test/resources/authenticators.xml
deleted file mode 100644
index 46d71cd..0000000
--- a/modules/security/src/test/resources/authenticators.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ~ 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. -->
-
-<!--
-This file contains a sample authenticator configuration. We can define all authenticators in this file. Each authenticator
-configuration has to start with tag "authenticator". The name is the name given to the authenticator. The actual
-authenticator implementation is implemented in the class. There are configurations specific to authenticators.
-Those configurations are reside inside &lt;specificConfigurations&gt; tags.
--->
-
-<authenticators>
-    <authenticator name="dbAuthenticator1" class="org.apache.airavata.security.configurations.TestDBAuthenticator1"
-                   enabled="true" priority="6" userstore="org.apache.airavata.security.userstore.JDBCUserStore">
-        <specificConfigurations>
-            <database>
-                <jdbcUrl>jdbc:sql:thin:@//myhost:1521/mysql1</jdbcUrl>
-                <userName>mysql1</userName>
-                <password>secret1</password>
-                <passwordHashMethod>MD5</passwordHashMethod>
-                <databaseDriver>org.apache.derby.jdbc.ClientDriver</databaseDriver>
-                <sessionTable>Session1</sessionTable>
-                <sessionColumn>sessioncolumn</sessionColumn>
-                <comparingColumn>comparecolumn</comparingColumn>
-                <!-- TODO add datasource.name></datasource.name -->
-            </database>
-        </specificConfigurations>
-    </authenticator>
-
-    <authenticator name="dbAuthenticator2" class="org.apache.airavata.security.configurations.TestDBAuthenticator2"
-                   enabled="true" priority="7" userstore="org.apache.airavata.security.userstore.LDAPUserStore">
-        <specificConfigurations>
-            <ldap>
-                <!--
-                url - The URL which LDAP server is listening for requests
-                systemUser - The DN of the LDAP server connection user
-                systemUserPassword - The password of the LDAP server connection user
-                userDNTemplate - The DN structure of the users in LDAP
-            -->
-                <url>ldap://localhost:10389</url>
-                <systemUser>admin</systemUser>
-                <systemUserPassword>secret</systemUserPassword>
-                <userDNTemplate>uid={0},ou=system</userDNTemplate>
-            </ldap>
-        </specificConfigurations>
-    </authenticator>
-
-    <authenticator name="dbAuthenticator4" class="org.apache.airavata.security.configurations.TestDBAuthenticator2"
-                   enabled="false" priority="7" userstore="org.apache.airavata.security.userstore.JDBCUserStore">
-        <specificConfigurations>
-            <database>
-                <jdbcUrl>jdbc:sql:thin:@//myhost:1521/mysql2</jdbcUrl>
-                <userName>mysql2</userName>
-                <password>secret2</password>
-                <databaseDriver>org.apache.derby.jdbc.ClientDriver</databaseDriver>
-                <sessionTable>Session2</sessionTable>
-                <sessionColumn>sessioncolumn2</sessionColumn>
-                <comparingColumn>comparecolumn2</comparingColumn>
-            </database>
-        </specificConfigurations>
-    </authenticator>
-
-    <authenticator name="dbAuthenticator3" class="org.apache.airavata.security.configurations.TestDBAuthenticator3"
-                   enabled="true" priority="8" userstore="org.apache.airavata.security.userstore.JDBCUserStore">
-        <specificConfigurations>
-            <database>
-                <jdbcUrl>jdbc:sql:thin:@//myhost:1521/mysql3</jdbcUrl>
-                <userName>mysql3</userName>
-                <password>secret3</password>
-                <databaseDriver>org.apache.derby.jdbc.ClientDriver</databaseDriver>
-                <sessionTable>Session3</sessionTable>
-                <sessionColumn>sessioncolumn3</sessionColumn>
-                <comparingColumn>comparecolumn3</comparingColumn>
-            </database>
-        </specificConfigurations>
-    </authenticator>
-
-</authenticators>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/security/src/test/resources/disabled-authenticator.xml
----------------------------------------------------------------------
diff --git a/modules/security/src/test/resources/disabled-authenticator.xml b/modules/security/src/test/resources/disabled-authenticator.xml
deleted file mode 100644
index 627ba57..0000000
--- a/modules/security/src/test/resources/disabled-authenticator.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ~ 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. -->
-
-<!--
-This file contains a sample authenticator configuration. We can define all authenticators in this file. Each authenticator
-configuration has to start with tag "authenticator". The name is the name given to the authenticator. The actual
-authenticator implementation is implemented in the class. There are configurations specific to authenticators.
-Those configurations are reside inside &lt;specificConfigurations&gt; tags.
--->
-
-<authenticators enabled="false">
-    <authenticator name="dbAuthenticator1" class="org.apache.airavata.security.configurations.TestDBAuthenticator1"
-                   enabled="true" priority="6" userstore="org.apache.airavata.security.userstore.JDBCUserStore">
-        <specificConfigurations>
-            <database>
-                <jdbcUrl>jdbc:sql:thin:@//myhost:1521/mysql1</jdbcUrl>
-                <userName>mysql1</userName>
-                <password>secret1</password>
-                <databaseDriver>org.apache.derby.jdbc.ClientDriver</databaseDriver>
-                <sessionTable>Session1</sessionTable>
-                <sessionColumn>sessioncolumn</sessionColumn>
-                <comparingColumn>comparecolumn</comparingColumn>
-                <!-- TODO add datasource.name></datasource.name -->
-            </database>
-        </specificConfigurations>
-    </authenticator>
-
-    <authenticator name="dbAuthenticator2" class="org.apache.airavata.security.configurations.TestDBAuthenticator2"
-                   enabled="true" priority="7" userstore="org.apache.airavata.security.userstore.JDBCUserStore">
-        <specificConfigurations>
-            <database>
-                <jdbcUrl>jdbc:sql:thin:@//myhost:1521/mysql2</jdbcUrl>
-                <userName>mysql2</userName>
-                <password>secret2</password>
-                <databaseDriver>org.apache.derby.jdbc.ClientDriver</databaseDriver>
-                <sessionTable>Session2</sessionTable>
-                <sessionColumn>sessioncolumn2</sessionColumn>
-                <comparingColumn>comparecolumn2</comparingColumn>
-            </database>
-        </specificConfigurations>
-    </authenticator>
-
-    <authenticator name="dbAuthenticator4" class="org.apache.airavata.security.configurations.TestDBAuthenticator2"
-                   enabled="false" priority="7" userstore="org.apache.airavata.security.userstore.JDBCUserStore">
-        <specificConfigurations>
-            <database>
-                <jdbcUrl>jdbc:sql:thin:@//myhost:1521/mysql2</jdbcUrl>
-                <userName>mysql2</userName>
-                <password>secret2</password>
-                <databaseDriver>org.apache.derby.jdbc.ClientDriver</databaseDriver>
-                <sessionTable>Session2</sessionTable>
-                <sessionColumn>sessioncolumn2</sessionColumn>
-                <comparingColumn>comparecolumn2</comparingColumn>
-            </database>
-        </specificConfigurations>
-    </authenticator>
-
-    <authenticator name="dbAuthenticator3" class="org.apache.airavata.security.configurations.TestDBAuthenticator3"
-                   enabled="true" priority="8" userstore="org.apache.airavata.security.userstore.JDBCUserStore">
-        <specificConfigurations>
-            <database>
-                <jdbcUrl>jdbc:sql:thin:@//myhost:1521/mysql3</jdbcUrl>
-                <userName>mysql3</userName>
-                <password>secret3</password>
-                <databaseDriver>org.apache.derby.jdbc.ClientDriver</databaseDriver>
-                <sessionTable>Session3</sessionTable>
-                <sessionColumn>sessioncolumn3</sessionColumn>
-                <comparingColumn>comparecolumn3</comparingColumn>
-            </database>
-        </specificConfigurations>
-    </authenticator>
-
-</authenticators>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/security/src/test/resources/jdbc-authenticator.xml
----------------------------------------------------------------------
diff --git a/modules/security/src/test/resources/jdbc-authenticator.xml b/modules/security/src/test/resources/jdbc-authenticator.xml
deleted file mode 100644
index c27b60f..0000000
--- a/modules/security/src/test/resources/jdbc-authenticator.xml
+++ /dev/null
@@ -1,39 +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.
-  ~  *
-  ~  */
-  -->
-<authenticators>
-    <authenticator name="dbAuthenticator1" class="org.apache.airavata.security.configurations.TestDBAuthenticator1"
-                   enabled="true" priority="6" userstore="org.apache.airavata.security.userstore.JDBCUserStore">
-        <specificConfigurations>
-            <database>
-                <!--jdbcUrl>jdbc:h2:modules/commons/airavata-registry-rest/src/test/resources/testdb/test</jdbcUrl-->
-                <jdbcUrl>jdbc:derby://localhost:20000/persistent_data;create=true</jdbcUrl>
-                <userName>admin</userName>
-                <password>admin</password>
-                <databaseDriver>org.apache.derby.jdbc.ClientDriver</databaseDriver>
-                <userTableName>AIRAVATA_USER</userTableName>
-                <userNameColumnName>USERID</userNameColumnName>
-                <passwordColumnName>PASSWORD</passwordColumnName>
-            </database>
-        </specificConfigurations>
-    </authenticator>
-</authenticators>

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/security/src/test/resources/ldap-authenticator.xml
----------------------------------------------------------------------
diff --git a/modules/security/src/test/resources/ldap-authenticator.xml b/modules/security/src/test/resources/ldap-authenticator.xml
deleted file mode 100644
index 651920f..0000000
--- a/modules/security/src/test/resources/ldap-authenticator.xml
+++ /dev/null
@@ -1,41 +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.
-  ~  *
-  ~  */
-  -->
-<authenticators>
-    <authenticator name="dbAuthenticator1" class="org.apache.airavata.security.configurations.TestDBAuthenticator1"
-                   enabled="true" priority="6" userstore="org.apache.airavata.security.userstore.LDAPUserStore">
-        <specificConfigurations>
-            <ldap>
-                <!--
-                url - The URL which LDAP server is listening for requests
-                systemUser - The DN of the LDAP server connection user
-                systemUserPassword - The password of the LDAP server connection user
-                userDNTemplate - The DN structure of the users in LDAP
-            -->
-                <url>ldap://localhost:10389</url>
-                <systemUser>admin</systemUser>
-                <systemUserPassword>secret</systemUserPassword>
-                <userDNTemplate>uid={0},ou=system</userDNTemplate>
-            </ldap>
-        </specificConfigurations>
-    </authenticator>
-</authenticators>

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/security/src/test/resources/session-authenticator.xml
----------------------------------------------------------------------
diff --git a/modules/security/src/test/resources/session-authenticator.xml b/modules/security/src/test/resources/session-authenticator.xml
deleted file mode 100644
index 670913e..0000000
--- a/modules/security/src/test/resources/session-authenticator.xml
+++ /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.
-  ~  *
-  ~  */
-  -->
-
-<authenticators>
-    <authenticator name="sessionAuthenticator" class="org.apache.airavata.services.registry.rest.security.session.SessionAuthenticator"
-                   enabled="true" priority="6" userstore="org.apache.airavata.security.userstore.SessionDBUserStore">
-        <specificConfigurations>
-            <database>
-                <!--jdbcUrl>jdbc:h2:modules/commons/airavata-registry-rest/src/test/resources/testdb/test</jdbcUrl-->
-                <!-- Points to /Users/thejaka/development/apache/airavata/trunk/modules/commons/airavata-registry-rest/target/tomcat6x/. -->
-                <jdbcUrl>jdbc:derby://localhost:20000/persistent_data;create=true</jdbcUrl>
-
-                <!--jdbcUrl>jdbc:h2:modules/security/src/test/resources/testdb/test</jdbcUrl-->
-
-                <userName>admin</userName>
-                <password>admin</password>
-                <databaseDriver>org.apache.derby.jdbc.ClientDriver</databaseDriver>
-                <sessionTable>Persons</sessionTable>
-                <sessionColumn>sessionId</sessionColumn>
-                <comparingColumn>sessionId</comparingColumn>
-            </database>
-        </specificConfigurations>
-    </authenticator>
- </authenticators>
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/workflow-interpreter/pom.xml
----------------------------------------------------------------------
diff --git a/modules/workflow-interpreter/pom.xml b/modules/workflow-interpreter/pom.xml
deleted file mode 100644
index c0845d1..0000000
--- a/modules/workflow-interpreter/pom.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--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. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.apache.airavata</groupId>
-        <artifactId>airavata</artifactId>
-        <version>0.6-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>airavata-workflow-interpreter</artifactId>
-    <name>Airavata Workflow Interpreter</name>
-    <url>http://airavata.apache.org/</url>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-xbaya-gui</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <defaultGoal>install</defaultGoal>
-        <sourceDirectory>src</sourceDirectory>
-        <testSourceDirectory>test</testSourceDirectory>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-wsdl2code-maven-plugin</artifactId>
-                <version>${axis2.version}</version>
-                <configuration>
-                    <generateServerSide>true</generateServerSide>
-                    <generateServicesXml>false</generateServicesXml>
-                    <generateTestcase>true</generateTestcase>
-                    <outputDirectory>target/generated/wsdl2code</outputDirectory>
-                    <packageName>org.apache.airavata.workflow.interpreter</packageName>
-                    <wsdlFile>${pom.basedir}/src/main/resources/WorkflowInterpretor.wsdl</wsdlFile>
-                    <databindingName>xmlbeans</databindingName>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>wsdl2code</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-aar-maven-plugin</artifactId>
-                <version>${axis2.version}</version>
-                <configuration>
-                    <servicesXmlFile>${pom.basedir}/src/main/resources/services.xml</servicesXmlFile>
-                    <wsdlFile>${pom.basedir}/src/main/resources/WorkflowInterpretor.wsdl</wsdlFile>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>createAAR</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>aar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <resources>
-            <resource>
-                <directory>resources</directory>
-                <targetPath>META-INF</targetPath>
-                <includes>
-                    <include>**/*.wsdl</include>
-                    <include>**/*.xml</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>${pom.basedir}/target/generated/wsdl2code/resources</directory>
-                <includes>
-                    <include>**/**</include>
-                </includes>
-            </resource>
-        </resources>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/workflow-interpreter/src/main/resources/WorkflowInterpretor.wsdl
----------------------------------------------------------------------
diff --git a/modules/workflow-interpreter/src/main/resources/WorkflowInterpretor.wsdl b/modules/workflow-interpreter/src/main/resources/WorkflowInterpretor.wsdl
deleted file mode 100644
index dd5a8a0..0000000
--- a/modules/workflow-interpreter/src/main/resources/WorkflowInterpretor.wsdl
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--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. -->
-
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns="http://workflow.airavata.apache.org"
-	xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" targetNamespace="http://workflow.airavata.apache.org">
-
-	<wsdl:types>
-		<xs:schema targetNamespace="http://workflow.airavata.apache.org">
-			<xs:element name="launchWorkflow">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="workflowAsString"
-							nillable="true" type="xs:string" />
-						<xs:element minOccurs="0" name="topic" nillable="true"
-							type="xs:string" />
-						<xs:element maxOccurs="unbounded" minOccurs="0" name="inputs"
-							nillable="true" type="ns:NameValue" />
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="configurations" nillable="true" type="ns:NameValue" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="launchWorkflowResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="return" nillable="true"
-							type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="NameValue">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="name" nillable="true"
-						type="xs:string" />
-					<xs:element minOccurs="0" name="value" nillable="true"
-						type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-		</xs:schema>
-	</wsdl:types>
-	<wsdl:message name="launchWorkflowRequest">
-		<wsdl:part name="parameters" element="ns:launchWorkflow">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="launchWorkflowResponse">
-		<wsdl:part name="parameters" element="ns:launchWorkflowResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:portType name="WorkflowInterpretorPortType">
-		<wsdl:operation name="launchWorkflow">
-			<wsdl:input message="ns:launchWorkflowRequest"
-				wsaw:Action="urn:launchWorkflow">
-			</wsdl:input>
-			<wsdl:output message="ns:launchWorkflowResponse"
-				wsaw:Action="urn:launchWorkflowResponse">
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="WorkflowInterpretorSoap11Binding"
-		type="ns:WorkflowInterpretorPortType">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="launchWorkflow">
-			<soap:operation soapAction="urn:launchWorkflow" style="document" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="WorkflowInterpretor">
-		<wsdl:port name="WorkflowInterpretorHttpSoap11Endpoint"
-			binding="ns:WorkflowInterpretorSoap11Binding">
-			<soap:address
-				location="http://localhost:8080/axis2/services/WorkflowInterpretor" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/workflow-interpreter/src/main/resources/services.xml
----------------------------------------------------------------------
diff --git a/modules/workflow-interpreter/src/main/resources/services.xml b/modules/workflow-interpreter/src/main/resources/services.xml
deleted file mode 100644
index 5a5b034..0000000
--- a/modules/workflow-interpreter/src/main/resources/services.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--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. -->
-
-<serviceGroup>
-    <service name="WorkflowInterpretor">
-        <messageReceivers>
-            <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out" class="org.apache.airavata.workflow.interpreter.WorkflowInterpretorMessageReceiverInOut"/>
-        </messageReceivers>
-        <parameter name="ServiceClass">org.apache.airavata.workflow.interpreter.WorkflowInterpretorSkeleton</parameter>
-        <parameter name="useOriginalwsdl">true</parameter>
-        <parameter name="modifyUserWSDLPortAddress">true</parameter>
-        <operation name="launchWorkflow" mep="http://www.w3.org/ns/wsdl/in-out" namespace="http://workflow.airavata.apache.org">
-            <actionMapping>urn:launchWorkflow</actionMapping>
-            <outputActionMapping>urn:launchWorkflowResponse</outputActionMapping>
-        </operation>
-    </service>
-</serviceGroup>

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/workflow-model/pom.xml
----------------------------------------------------------------------
diff --git a/modules/workflow-model/pom.xml b/modules/workflow-model/pom.xml
index b58f5e0..81959da 100644
--- a/modules/workflow-model/pom.xml
+++ b/modules/workflow-model/pom.xml
@@ -25,8 +25,5 @@
 
 	<modules>
 		<module>workflow-model-core</module>
-		<!--module>workflow-model-component</module>
-		<module>workflow-model-component-node</module-->
-		<!--module>workflow-engine</module-->
 	</modules>
 </project>

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/workflow-model/workflow-model-component-node/pom.xml
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-model-component-node/pom.xml b/modules/workflow-model/workflow-model-component-node/pom.xml
deleted file mode 100644
index c901bd9..0000000
--- a/modules/workflow-model/workflow-model-component-node/pom.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--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. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.apache.airavata</groupId>
-        <artifactId>airavata-workflow-model-parent</artifactId>
-        <version>0.12-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>airavata-workflow-model-component-node</artifactId>
-    <packaging>jar</packaging>
-    <name>Airavata Workflow Component Node</name>
-    <url>http://airavata.apache.org/</url>
-
-    <!-- Edit the following properties. -->
-    <profiles>
-        <profile>
-            <id>collective</id>
-            <activation>
-                <file>
-                    <exists>betacollective</exists>
-                </file>
-            </activation>
-            <properties>
-                <!-- Inherited from the parent in this collective build. -->
-                <ssl.trustedCertsFile>${trustedCertsLocation}</ssl.trustedCertsFile>
-                <build.scope>provided</build.scope>
-                <build.jsf>compile</build.jsf>
-            </properties>
-        </profile>
-    </profiles>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.ogce</groupId>
-            <artifactId>xsul</artifactId>
-            <version>${xsul.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.ogce</groupId>
-            <artifactId>atomixmiser</artifactId>
-            <version>${atomixmiser.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-common-utils</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <version>${org.slf4j.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>${org.slf4j.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/workflow-model/workflow-model-component/pom.xml
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-model-component/pom.xml b/modules/workflow-model/workflow-model-component/pom.xml
deleted file mode 100644
index 0a08064..0000000
--- a/modules/workflow-model/workflow-model-component/pom.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--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. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.apache.airavata</groupId>
-        <artifactId>airavata-workflow-model-parent</artifactId>
-        <version>0.12-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>airavata-workflow-model-component</artifactId>
-    <packaging>jar</packaging>
-    <name>Airavata Workflow Component</name>
-    <url>http://airavata.apache.org/</url>
-
-    <!-- Edit the following properties. -->
-    <profiles>
-        <profile>
-            <id>collective</id>
-            <activation>
-                <file>
-                    <exists>betacollective</exists>
-                </file>
-            </activation>
-            <properties>
-                <!-- Inherited from the parent in this collective build. -->
-                <ssl.trustedCertsFile>${trustedCertsLocation}</ssl.trustedCertsFile>
-                <build.scope>provided</build.scope>
-                <build.jsf>compile</build.jsf>
-            </properties>
-        </profile>
-    </profiles>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ogce</groupId>
-            <artifactId>xsul</artifactId>
-            <version>${xsul.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-common-utils</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-client-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <version>${org.slf4j.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>${org.slf4j.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentReference.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentReference.java b/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentReference.java
deleted file mode 100644
index de5f78c..0000000
--- a/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentReference.java
+++ /dev/null
@@ -1,65 +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.airavata.workflow.model.component.registry;
-
-import java.util.List;
-
-import org.apache.airavata.workflow.model.component.Component;
-import org.apache.airavata.workflow.model.component.ComponentException;
-import org.apache.airavata.workflow.model.component.ComponentReference;
-import org.apache.airavata.workflow.model.component.ComponentRegistryException;
-import org.apache.airavata.workflow.model.component.ws.WSComponent;
-import org.apache.airavata.workflow.model.component.ws.WSComponentFactory;
-
-public class JCRComponentReference extends ComponentReference {
-
-    private String wsdl;
-
-    private List<WSComponent> components;
-
-    public JCRComponentReference(String name, String wsdl) {
-        super(name);
-        this.wsdl = wsdl;
-    }
-
-    /**
-     * @throws ComponentException
-     * @throws ComponentRegistryException
-     * @see org.apache.airavata.workflow.model.component.ComponentReference#getComponent()
-     */
-    @Override
-    @Deprecated
-    public Component getComponent() throws ComponentException, ComponentRegistryException {
-        return getComponents().get(0);
-    }
-
-    /**
-     * @see org.apache.airavata.workflow.model.component.ComponentReference#getComponents()
-     */
-    @Override
-    public List<WSComponent> getComponents() throws ComponentRegistryException, ComponentException {
-        if (this.components == null) {
-            this.components = WSComponentFactory.createComponents(wsdl);
-        }
-        return this.components;
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java b/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
deleted file mode 100644
index 5062dfd..0000000
--- a/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
+++ /dev/null
@@ -1,162 +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.airavata.workflow.model.component.registry;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.util.WebServiceUtil;
-import org.apache.airavata.workflow.model.component.ComponentReference;
-import org.apache.airavata.workflow.model.component.ComponentRegistry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class JCRComponentRegistry extends ComponentRegistry {
-
-    private static final Logger log = LoggerFactory.getLogger(JCRComponentRegistry.class);
-    private static final String NAME = "Application Services";
-//    public static final String REPOSITORY_PROPERTIES = "airavata-server.properties";
-
-    private AiravataAPI airavataAPI;
-
-    public JCRComponentRegistry(AiravataAPI airavataAPI) {
-        this.setAiravataAPI(airavataAPI);
-    }
-
-//    public JCRComponentRegistry(String username, String password) throws RegistryException {
-//        String gatewayName=null;
-//        String registryURL = null;
-//        AiravataRegistryConnectionDataProvider provider = AiravataRegistryFactory.getRegistryConnectionDataProvider();
-//		if (provider==null){
-//	        URL configURL = this.getClass().getClassLoader().getResource(REPOSITORY_PROPERTIES);
-//	        if(configURL != null){
-//		        try {
-//			        Properties properties = new Properties();
-//		            properties.load(configURL.openStream());
-//		            if (username==null){
-//			            if(properties.get(RegistryConstants.KEY_DEFAULT_REGISTRY_USER) != null){
-//			                username = (String)properties.get(RegistryConstants.KEY_DEFAULT_REGISTRY_USER);
-//			            }
-//		            }
-//		            gatewayName = (String)properties.get(RegistryConstants.KEY_DEFAULT_GATEWAY_ID);
-//                    registryURL =  properties.getProperty(RegistryConstants.KEY_DEFAULT_REGISTRY_URL);
-//		        } catch (MalformedURLException e) {
-//		            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-//		        } catch (IOException e) {
-//		            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-//		        }
-//	        }
-//        }else{
-//        	try {
-//				if (username==null){
-//					username=provider.getValue(RegistryConstants.KEY_DEFAULT_REGISTRY_USER).toString();
-//				}
-//				gatewayName = provider.getValue(RegistryConstants.KEY_DEFAULT_GATEWAY_ID).toString();
-//                registryURL = provider.getValue(RegistryConstants.KEY_DEFAULT_REGISTRY_URL).toString();
-//			} catch (Exception e) {
-//				log.warn(e.getMessage());
-//			}
-//        }
-//        if (username==null){
-//        	username="admin";
-//        }
-//        if (gatewayName==null){
-//        	gatewayName="default";
-//        }
-//        try {
-//            URI baseUri = new URI(registryURL);
-//            //TODO callback class
-////            PasswordCallBackImpl passwordCallBack = new PasswordCallBackImpl(username, password);
-//            this.airavataAPI = AiravataAPIFactory.getAPI(baseUri, gatewayName, username, (PasswordCallback)null);
-//        }  catch (URISyntaxException e) {
-//            log.error("Error initializing Airavata Client");
-//        } catch (AiravataAPIInvocationException e) {
-//            log.error("Error initializing Airavata Client");
-//        }
-//
-//    }
-
-    static {
-        registerUserManagers();
-    }
-
-    /**
-     * to manually trigger user manager registrations
-     */
-    private static void registerUserManagers() {
-        try {
-            Class.forName("org.apache.airavata.xbaya.component.registry.jackrabbit.user.JackRabbitUserManagerWrap");
-        } catch (ClassNotFoundException e) {
-            // error in registering user managers
-        }
-    }
-
-    /**
-     * @see org.apache.airavata.workflow.model.component.registry.ComponentRegistry#getComponentReferenceList()
-     */
-    @Override
-    public List<ComponentReference> getComponentReferenceList() {
-        List<ComponentReference> tree = new ArrayList<ComponentReference>();
-        try {
-            List<ServiceDescription> services = this.getAiravataAPI().getApplicationManager().getAllServiceDescriptions();
-            for (ServiceDescription serviceDescription : services) {
-                String serviceName = serviceDescription.getType().getName();
-                JCRComponentReference jcr = new JCRComponentReference(serviceName,
-                        WebServiceUtil.getWSDL(serviceDescription));
-                tree.add(jcr);
-            }
-        } catch (RegistryException e) {
-            log.error(e.getMessage(), e);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-		}
-
-        return tree;
-    }
-
-    /**
-     * @see org.apache.airavata.workflow.model.component.registry.ComponentRegistry#getName()
-     */
-    @Override
-    public String getName() {
-        return NAME;
-    }
-
-//    public String saveApplicationDescription(String service, String host, ApplicationDeploymentDescription app) {
-//        // deploy the service on host
-//        registry.deployServiceOnHost(service, host);
-//
-//        // save deployment description
-//        return registry.saveApplicationDescription(service, host, app);
-//    }
-
-    public AiravataAPI getAiravataAPI() {
-        return airavataAPI;
-    }
-
-	public void setAiravataAPI(AiravataAPI airavataAPI) {
-		this.airavataAPI = airavataAPI;
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/ws-messenger/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ws-messenger/distribution/pom.xml b/modules/ws-messenger/distribution/pom.xml
deleted file mode 100644
index ca93942..0000000
--- a/modules/ws-messenger/distribution/pom.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--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. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.apache.airavata</groupId>
-        <artifactId>airavata-ws-messenger</artifactId>
-        <version>0.5-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>airavata-ws-messenger-distribution</artifactId>
-    <name>distribution</name>
-    <url>http://airavata.apache.org/</url>
-    <packaging>pom</packaging>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.0-alpha-4</version>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>unpack-axis2</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.axis2</groupId>
-                                    <artifactId>axis2-webapp</artifactId>
-                                    <version>${axis2.version}</version>
-                                    <type>war</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>target/axis2-${axis2.version}</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2-beta-5</version>
-                <executions>
-                    <execution>
-                        <id>distribution-package</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <finalName>${archieve.name}-${project.version}</finalName>
-                            <descriptors>
-                                <descriptor>src/main/assembly/bin-assembly.xml</descriptor>
-                            </descriptors>
-                            <attach>false</attach>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>2.4.1</version>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>axis2-${axis2.version}</directory>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>${derby.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derbytools</artifactId>
-            <version>${derby.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.ogce</groupId>
-            <artifactId>yfilter</artifactId>
-            <version>${yfilter.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>wsdl4j</groupId>
-            <artifactId>wsdl4j</artifactId>
-            <version>1.5.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-messenger-client</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-messenger-commons</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-message-box</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-message-broker</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <archieve.name>airavata-ws-messenger</archieve.name>
-        <used.axis2.release>${axis2.version}</used.axis2.release>
-    </properties>
-</project>


Mime
View raw message