You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2014/04/14 20:30:33 UTC
[31/90] [abbrv] [partial] AIRAVATA-1124
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/rest/service/src/test/java/org/apache/airavata/services/registry/rest/security/MyHttpServletRequest.java
----------------------------------------------------------------------
diff --git a/modules/rest/service/src/test/java/org/apache/airavata/services/registry/rest/security/MyHttpServletRequest.java b/modules/rest/service/src/test/java/org/apache/airavata/services/registry/rest/security/MyHttpServletRequest.java
deleted file mode 100644
index 4c800f6..0000000
--- a/modules/rest/service/src/test/java/org/apache/airavata/services/registry/rest/security/MyHttpServletRequest.java
+++ /dev/null
@@ -1,373 +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.services.registry.rest.security;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.Principal;
-import java.util.*;
-
-/**
- * Test servlet implementation. For test cases only.
- */
-public class MyHttpServletRequest implements HttpServletRequest {
-
- private Map<String, String> headers = new HashMap<String, String>();
-
- public void addHeader(String name, String value) {
- headers.put(name, value);
- }
-
- @Override
- public String getAuthType() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Cookie[] getCookies() {
- return new Cookie[0]; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public long getDateHeader(String s) {
- return 0; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public String getHeader(String s) {
- return headers.get(s);
- }
-
- @Override
- public Enumeration<String> getHeaders(String s) {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Enumeration<String> getHeaderNames() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public int getIntHeader(String s) {
- return 0; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public String getMethod() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public String getPathInfo() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public String getPathTranslated() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public String getContextPath() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public String getQueryString() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public String getRemoteUser() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public boolean isUserInRole(String s) {
- return false; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Principal getUserPrincipal() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public String getRequestedSessionId() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public String getRequestURI() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public StringBuffer getRequestURL() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public String getServletPath() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public HttpSession getSession(boolean b) {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public HttpSession getSession() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public boolean isRequestedSessionIdValid() {
- return false; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public boolean isRequestedSessionIdFromCookie() {
- return false; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public boolean isRequestedSessionIdFromURL() {
- return false; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public boolean isRequestedSessionIdFromUrl() {
- return false; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public boolean authenticate(HttpServletResponse httpServletResponse) throws IOException, ServletException {
- return false; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public void login(String s, String s1) throws ServletException {
- // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public void logout() throws ServletException {
- // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Collection<Part> getParts() throws IOException, ServletException {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Part getPart(String s) throws IOException, ServletException {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Object getAttribute(String s) {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Enumeration<String> getAttributeNames() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public String getCharacterEncoding() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public void setCharacterEncoding(String s) throws UnsupportedEncodingException {
- // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public int getContentLength() {
- return 0; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public String getContentType() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public ServletInputStream getInputStream() throws IOException {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public String getParameter(String s) {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Enumeration<String> getParameterNames() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public String[] getParameterValues(String s) {
- return new String[0]; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Map<String, String[]> getParameterMap() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public String getProtocol() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public String getScheme() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public String getServerName() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public int getServerPort() {
- return 0; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public BufferedReader getReader() throws IOException {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public String getRemoteAddr() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public String getRemoteHost() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public void setAttribute(String s, Object o) {
- // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public void removeAttribute(String s) {
- // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Locale getLocale() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public Enumeration<Locale> getLocales() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public boolean isSecure() {
- return false; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public RequestDispatcher getRequestDispatcher(String s) {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public String getRealPath(String s) {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public int getRemotePort() {
- return 0; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public String getLocalName() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public String getLocalAddr() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public int getLocalPort() {
- return 0; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public ServletContext getServletContext() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public AsyncContext startAsync() throws IllegalStateException {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
- throws IllegalStateException {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public boolean isAsyncStarted() {
- return false; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public boolean isAsyncSupported() {
- return false; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public AsyncContext getAsyncContext() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public DispatcherType getDispatcherType() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
- }
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/rest/service/src/test/java/org/apache/airavata/services/registry/rest/security/basic/BasicAccessAuthenticatorTest.java
----------------------------------------------------------------------
diff --git a/modules/rest/service/src/test/java/org/apache/airavata/services/registry/rest/security/basic/BasicAccessAuthenticatorTest.java b/modules/rest/service/src/test/java/org/apache/airavata/services/registry/rest/security/basic/BasicAccessAuthenticatorTest.java
deleted file mode 100644
index 597894d..0000000
--- a/modules/rest/service/src/test/java/org/apache/airavata/services/registry/rest/security/basic/BasicAccessAuthenticatorTest.java
+++ /dev/null
@@ -1,116 +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.services.registry.rest.security.basic;
-
-import org.apache.airavata.common.utils.Constants;
-import org.apache.airavata.common.utils.DerbyUtil;
-import org.apache.airavata.security.configurations.AuthenticatorConfigurationReader;
-import org.apache.airavata.services.registry.rest.security.AbstractAuthenticatorTest;
-import org.apache.airavata.services.registry.rest.security.MyHttpServletRequest;
-import org.apache.airavata.services.registry.rest.security.session.SessionAuthenticator;
-import org.apache.commons.codec.binary.Base64;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Test class for basic access authenticator.
- */
-public class BasicAccessAuthenticatorTest extends AbstractAuthenticatorTest {
-
- private SessionAuthenticator sessionAuthenticator;
-
- private AuthenticatorConfigurationReader authenticatorConfigurationReader;
-
- public BasicAccessAuthenticatorTest() throws Exception {
- super("basicAccessAuthenticator");
- }
-
- @BeforeClass
- public static void setUpDatabase() throws Exception {
- DerbyUtil.startDerbyInServerMode(getHostAddress(), getPort(), getUserName(), getPassword());
-
- waitTillServerStarts();
-
- 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();
- }
-
- @Override
- public void testAuthenticateSuccess() throws Exception {
-
- Assert.assertTrue(authenticator.authenticate(getRequest("amilaj:secret")));
- }
-
- @Override
- public void testAuthenticateFail() throws Exception {
- Assert.assertFalse(authenticator.authenticate(getRequest("amilaj:secret1")));
- }
-
- @Test
- public void testAuthenticateFailUserName() throws Exception {
- Assert.assertFalse(authenticator.authenticate(getRequest("amila:secret1")));
- }
-
- @Override
- public void testCanProcess() throws Exception {
-
- Assert.assertTrue(authenticator.canProcess(getRequest("amilaj:secret")));
- }
-
- private MyHttpServletRequest getRequest(String userPassword) {
- MyHttpServletRequest myHttpServletRequest = new MyHttpServletRequest();
-
- String authHeader = "Basic " + new String(Base64.encodeBase64(userPassword.getBytes()));
-
- myHttpServletRequest.addHeader("Authorization", authHeader);
- myHttpServletRequest.addHeader(Constants.GATEWAY_NAME, "default");
-
- return myHttpServletRequest;
-
- }
-
- public void tearDown() throws Exception {
-
- }
-
- /*
- * public void testConfigure() throws Exception {
- *
- * BasicAccessAuthenticator basicAccessAuthenticator = (BasicAccessAuthenticator)authenticator;
- *
- * assertEquals("AIRAVATA_USER", basicAccessAuthenticator.getUserTable()); assertEquals("USERID",
- * basicAccessAuthenticator.getUserNameColumn()); assertEquals("PASSWORD",
- * basicAccessAuthenticator.getPasswordColumn()); }
- */
-
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/rest/service/src/test/java/org/apache/airavata/services/registry/rest/security/local/LocalUserStoreTest.java
----------------------------------------------------------------------
diff --git a/modules/rest/service/src/test/java/org/apache/airavata/services/registry/rest/security/local/LocalUserStoreTest.java b/modules/rest/service/src/test/java/org/apache/airavata/services/registry/rest/security/local/LocalUserStoreTest.java
deleted file mode 100644
index a371c7b..0000000
--- a/modules/rest/service/src/test/java/org/apache/airavata/services/registry/rest/security/local/LocalUserStoreTest.java
+++ /dev/null
@@ -1,113 +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.services.registry.rest.security.local;
-
-import org.apache.airavata.common.utils.DBUtil;
-import org.apache.airavata.common.utils.DatabaseTestCases;
-import org.apache.airavata.common.utils.DerbyUtil;
-import org.junit.*;
-
-import java.util.List;
-
-/**
- * A test class for local user store.
- */
-public class LocalUserStoreTest extends DatabaseTestCases {
-
- private LocalUserStore localUserStore;
-
- private static final String createTableScript = "create table Users\n" + "(\n"
- + " user_name varchar(255),\n" + " password varchar(255),\n"
- + " PRIMARY KEY(user_name)\n" + ")";
-
- @BeforeClass
- public static void setUpDatabase() throws Exception {
- DerbyUtil.startDerbyInServerMode(getHostAddress(), getPort(), getUserName(), getPassword());
-
- waitTillServerStarts();
-
- executeSQL(createTableScript);
-
- }
-
- @AfterClass
- public static void shutDownDatabase() throws Exception {
- DerbyUtil.stopDerbyServer();
- }
-
- @Before
- public void setUp() throws Exception {
-
- DBUtil dbUtil = new DBUtil(getJDBCUrl(), getUserName(), getPassword(), getDriver());
-
- localUserStore = new LocalUserStore(dbUtil);
- }
-
- @Test
- public void testAddUser() throws Exception {
-
- localUserStore.addUser("thejaka", "qwqwqw");
-
- List<String> users = localUserStore.getUsers();
- Assert.assertEquals(1, users.size());
- Assert.assertEquals("thejaka", users.get(0));
-
- localUserStore.deleteUser("thejaka");
-
- }
-
- @Test
- public void testChangePassword() throws Exception {
-
- localUserStore.addUser("thejaka", "qwqwqw");
-
- localUserStore.changePassword("thejaka", "qwqwqw", "sadsad");
-
- localUserStore.deleteUser("thejaka");
- }
-
- @Test
- public void testChangePasswordByAdmin() throws Exception {
-
- localUserStore.addUser("thejaka", "qwqwqw");
-
- localUserStore.changePasswordByAdmin("thejaka", "sadsad");
-
- localUserStore.deleteUser("thejaka");
- }
-
- @Test
- public void testDeleteUser() throws Exception {
-
- localUserStore.addUser("thejaka", "qwqwqw");
-
- List<String> users = localUserStore.getUsers();
- Assert.assertEquals(1, users.size());
- Assert.assertEquals("thejaka", users.get(0));
-
- localUserStore.deleteUser("thejaka");
-
- users = localUserStore.getUsers();
- Assert.assertEquals(0, users.size());
-
- }
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/rest/service/src/test/java/org/apache/airavata/services/registry/rest/security/session/SessionAuthenticatorTest.java
----------------------------------------------------------------------
diff --git a/modules/rest/service/src/test/java/org/apache/airavata/services/registry/rest/security/session/SessionAuthenticatorTest.java b/modules/rest/service/src/test/java/org/apache/airavata/services/registry/rest/security/session/SessionAuthenticatorTest.java
deleted file mode 100644
index 6be81b4..0000000
--- a/modules/rest/service/src/test/java/org/apache/airavata/services/registry/rest/security/session/SessionAuthenticatorTest.java
+++ /dev/null
@@ -1,84 +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.services.registry.rest.security.session;
-
-import org.apache.airavata.common.utils.DerbyUtil;
-import org.apache.airavata.services.registry.rest.security.AbstractAuthenticatorTest;
-import org.apache.airavata.services.registry.rest.security.MyHttpServletRequest;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-
-/**
- * Session authenticator test.
- */
-public class SessionAuthenticatorTest extends AbstractAuthenticatorTest {
-
- public SessionAuthenticatorTest() throws Exception {
- super("sessionAuthenticator");
- }
-
- @BeforeClass
- public static void setUpDatabase() throws Exception {
- DerbyUtil.startDerbyInServerMode(getHostAddress(), getPort(), getUserName(), getPassword());
-
- waitTillServerStarts();
-
- String createSessionTable = "create table Persons ( sessionId varchar(255) )";
- executeSQL(createSessionTable);
-
- String insertSessionSQL = "INSERT INTO Persons VALUES('1234')";
- executeSQL(insertSessionSQL);
- }
-
- @AfterClass
- public static void shutDownDatabase() throws Exception {
- DerbyUtil.stopDerbyServer();
- }
-
- public void testAuthenticateSuccess() throws Exception {
-
- MyHttpServletRequest servletRequestRequest = new MyHttpServletRequest();
- servletRequestRequest.addHeader("sessionTicket", "1234");
-
- Assert.assertTrue(authenticator.authenticate(servletRequestRequest));
-
- }
-
- public void testAuthenticateFail() throws Exception {
-
- MyHttpServletRequest servletRequestRequest = new MyHttpServletRequest();
- servletRequestRequest.addHeader("sessionTicket", "12345");
-
- Assert.assertFalse(authenticator.authenticate(servletRequestRequest));
-
- }
-
- public void testCanProcess() throws Exception {
-
- MyHttpServletRequest servletRequestRequest = new MyHttpServletRequest();
- servletRequestRequest.addHeader("sessionTicket", "12345");
-
- Assert.assertTrue(authenticator.canProcess(servletRequestRequest));
-
- }
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/rest/service/src/test/resources/authenticators.xml
----------------------------------------------------------------------
diff --git a/modules/rest/service/src/test/resources/authenticators.xml b/modules/rest/service/src/test/resources/authenticators.xml
deleted file mode 100644
index 7d9d2bd..0000000
--- a/modules/rest/service/src/test/resources/authenticators.xml
+++ /dev/null
@@ -1,55 +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 <specificConfigurations> tags.
--->
-
-<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-->
- <jdbcUrl>jdbc:derby://localhost:20000/persistent_data;create=true</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>
-
- <authenticator name="basicAccessAuthenticator" class="org.apache.airavata.services.registry.rest.security.basic.BasicAccessAuthenticator"
- enabled="true" priority="7" 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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/rest/webapp/README.txt
----------------------------------------------------------------------
diff --git a/modules/rest/webapp/README.txt b/modules/rest/webapp/README.txt
deleted file mode 100644
index dec3a08..0000000
--- a/modules/rest/webapp/README.txt
+++ /dev/null
@@ -1,164 +0,0 @@
-To build
-mvn clean install
-
-For development run
-mvn cargo:start
-
-To test
-* Start database according what you specified in the airavata-server.properties
-* for simple methods you can use curl for testing.
-
-**************For Configuration releated methods********************
- curl -v 'http://localhost:9080/airavata-registry/registry/api/configuration?key=key1'
- curl -v 'http://localhost:9080/airavata-registry/registry/api/configurationlist?key=key1'
- curl -H "Accept: text/plain" -X POST -d "key=key1&value=value4&date=2012-09-21 04:09:56" http://localhost:9080/airavata-registry/registry/api/save/configuration
- curl -H "Accept: text/plain" -X POST -d "key=key1&value=value5&date=2012-09-23 04:09:56" http://localhost:9080/airavata-registry/registry/api/update/configuration
- curl --request DELETE http://localhost:9080/airavata-registry/registry/api/delete/allconfiguration?key=key1
- curl --request DELETE 'http://localhost:9080/airavata-registry/registry/api/delete/configuration?key=key2&value=value2'
- curl --request GET http://localhost:9080/airavata-registry/registry/api/gfac/urilist
- curl --request GET http://localhost:9080/airavata-registry/registry/api/workflowinterpreter/urilist
- curl --request GET http://localhost:9080/airavata-registry/registry/api/eventingservice/uri
- curl --request GET http://localhost:9080/airavata-registry/registry/api/messagebox/uri
- curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:9080/axis2/services/GFacService2" http://localhost:9080/airavata-registry/registry/api/add/gfacuri
- curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:9080/axis2/services/WorkflowInterpretor2" http://localhost:9080/airavata-registry/registry/api/add/workflowinterpreteruri
- curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:9080/axis2/services/EventingService2" http://localhost:9080/airavata-registry/registry/api/add/eventinguri
- curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:9080/axis2/services/MsgBoxService2" http://localhost:9080/airavata-registry/registry/api/add/msgboxuri
- curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:9080/axis2/services/GFacService2&date=2012-10-18 00:00:00" http://localhost:9080/airavata-registry/registry/api/add/gfacuri/date
- curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:9080/axis2/services/WorkflowInterpretor2&date=2012-10-18 00:00:00" http://localhost:9080/airavata-registry/registry/api/add/workflowinterpreteruri/date
- curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:9080/axis2/services/MsgBoxService2&date=2012-10-18 00:00:00" http://localhost:9080/airavata-registry/registry/api/add/msgboxuri/date
- curl --request DELETE http://localhost:9080/airavata-registry/registry/api/delete/gfacuri?uri=http://192.168.17.1:9080/axis2/services/GFacService2
- curl --request DELETE http://localhost:9080/airavata-registry/registry/api/delete/allgfacuris
- curl --request DELETE http://localhost:9080/airavata-registry/registry/api/delete/workflowinterpreteruri?uri=http://192.168.17.1:9080/axis2/services/WorkflowInterpretor2
- curl --request DELETE http://localhost:9080/airavata-registry/registry/api/delete/allworkflowinterpreteruris
- curl --request DELETE http://localhost:9080/airavata-registry/registry/api/delete/eventinguri
- curl --request DELETE http://localhost:9080/airavata-registry/registry/api/delete/msgboxuri
-
-************For descriptiors*********************************
- ############## Host descriptrors ##########################
-
- curl --request GET http://localhost:9080/airavata-registry/registry/api/hostdescriptor/exist?descriptorName=ember
- curl -H "Accept:application/json" -X POST -H "Content-Type:application/json" -d '{"hostname":"testHost1", "hostAddress":"testHostAddress" }' http://localhost:9080/airavata-registry/registry/api/hostdescriptor/save
- curl -H "Accept:application/json" -X POST -H "Content-Type:application/json" -d '{"hostname":"testHost1", "hostAddress":"testHostAddress2" }' http://localhost:9080/airavata-registry/registry/api/hostdescriptor/update
- curl --request GET http://localhost:9080/airavata-registry/registry/api/host/description?hostName=testHost1
- curl --request DELETE http://localhost:9080/airavata-registry/registry/api/hostdescriptor/delete?hostName=testHost1
- curl --request GET http://localhost:9080/airavata-registry/registry/api/get/hostdescriptors
-
- ############## Service descriptrors ##########################
- curl --request GET http://localhost:9080/airavata-registry/registry/api/servicedescriptor/exist?descriptorName=echo
- curl -H "Accept:application/json" -X POST -H "Content-Type:application/json" -d '{"serviceName":"testService1", "description":"test description","inputParams":{"dataType":"input", "description":"myinput","name":"myinput","type":"String"},"outputParams":{"dataType":"output","description":"myoutput","name":"myoutput","type":"String"}}' http://localhost:9080/airavata-registry/registry/api/servicedescriptor/save
- curl -H "Accept:application/json" -X POST -H "Content-Type:application/json" -d '{"serviceName":"testService2", "description":"test description2","inputParams":{"dataType":"input", "description":"myinput2","name":"myinput2","type":"String"},"outputParams":{"dataType":"output","description":"myoutput2","name":"myoutput2","type":"String"}}' http://localhost:9080/airavata-registry/registry/api/servicedescriptor/update
- curl --request GET http://localhost:9080/airavata-registry/registry/api/servicedescriptor/description?serviceName=echo1
- curl --request DELETE http://localhost:9080/airavata-registry/registry/api/servicedescriptor/delete?serviceName=echo1
- curl --request GET http://localhost:9080/airavata-registry/registry/api/get/servicedescriptors
-
- ############## Application descriptrors ##########################
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/applicationdescriptor/exist?serviceName=echo&hostName=LocalHost&descriptorName=LocalHost_application'
- curl -H "Accept:application/json" -X POST -H "Content-Type:application/json" -d '{"name":"abc1", "hostdescName":"LocalHost", "executablePath":"cccc", "workingDir":"dddd" , "serviceDescriptor":{"inputParams":{"dataType":"input", "description":"myinput","name":"myinput","type":"String"},"outputParams":{"dataType":"output","description":"myoutput","name":"myoutput","type":"String"}}}' http://localhost:9080/airavata-registry/registry/api/applicationdescriptor/build/save
- curl -H "Accept:application/json" -X POST -H "Content-Type:application/json" -d '{"name":"abc1", "hostdescName":"LocalHost", "executablePath":"cccc111", "workingDir":"dddd1111" , "serviceDescriptor":{"inputParams":{"dataType":"input", "description":"myinput11","name":"myinput11","type":"String"},"outputParams":{"dataType":"output","description":"myoutput11","name":"myoutput11","type":"String"}}}' http://localhost:9080/airavata-registry/registry/api/applicationdescriptor/update
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/applicationdescriptor/description?serviceName=echo&hostName=LocalHost&applicationName=LocalHost_application2'
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/applicationdescriptors/alldescriptors/host/service?serviceName=echo&hostName=LocalHost'
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/applicationdescriptor/alldescriptors/service?serviceName=echo'
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/applicationdescriptor/alldescriptors'
- curl --request DELETE 'http://localhost:9080/airavata-registry/registry/api/applicationdescriptor/delete?serviceName=echo&hostName=LocalHost&appName=LocalHost_application2'
-
-************ Project Registry *********************************
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/project/exist?projectName=default'
- curl -H "Accept: text/plain" -X POST -d 'projectName=project1' http://localhost:9080/airavata-registry/registry/api/add/project
- curl -H "Accept: text/plain" -X POST -d 'projectName=project1' http://localhost:9080/airavata-registry/registry/api/update/project
- curl --request DELETE 'http://localhost:9080/airavata-registry/registry/api/delete/project?projectName=project1'
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/project?projectName=project1'
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/projects'
-
-************* Experiments *************************************
- curl --request DELETE 'http://localhost:9080/airavata-registry/registry/api/delete/experiment?experimentId=eb9e67cf-6fe3-46f1-b50b-7b42936d347d
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/experiments/all'
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/experiments/project?projectName=default'
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/experiments/date?fromDate=2012-10-16%2000:00:00&toDate=2012-10-18%2000:00:00'
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/experiments/project/date?projectName=default&fromDate=2012-10-16%2000:00:00&toDate=2012-10-18%2000:00:00'
- curl -H "Accept: text/plain" -X POST -d 'projectName=project1&experimentID=testexpID1&submittedDate=2012-10-18 00:00:00' http://localhost:9080/airavata-registry/registry/api/add/experiment
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/experiment/exist?experimentId=testexpID1'
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/experiment/notexist/create?experimentId=testExpID2&createIfNotPresent=true'
- curl -H "Accept: text/plain" -X POST -d 'experimentId=testExpID2&user=abc' http://localhost:9080/airavata-registry/registry/api/update/experiment
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/experiment/executionuser?experimentId=testExpID2'
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/experiment/name?experimentId=testExpID2'
- curl -H "Accept: text/plain" -X POST -d 'experimentId=testExpID2&experimentName=ddscsddsss111' http://localhost:9080/airavata-registry/registry/api/update/experimentname
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/experimentmetadata?experimentId=testExpID2'
- curl -H "Accept: text/plain" -X POST -d 'experimentId=testExpID2&metadata=aaaaaaa' http://localhost:9080/airavata-registry/registry/api/update/experimentmetadata
-
-************* Workflow Execution *************************************
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/workflowtemplatename?workflowInstanceId=e00ddc5e-f8d5-4492-9eb2-10372efb103c'
- curl -H "Accept: text/plain" -X POST -d 'workflowInstanceId=e00ddc5e-f8d5-4492-9eb2-10372efb103c&templateName=wftemplate1' http://localhost:9080/airavata-registry/registry/api/update/workflowinstancetemplatename
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/experimentworkflowinstances?experimentId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4'
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/workflowinstance/exist/check?instanceId=e00ddc5e-f8d5-4492-9eb2-10372efb103c'
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/workflowinstance/exist/create?instanceId=testWFInstanceID&createIfNotPresent=true'
- curl -H "Accept: text/plain" -X POST -d 'instanceId=testWFInstanceID&executionStatus=FINISHED' http://localhost:9080/airavata-registry/registry/api/update/workflowinstancestatus/instanceid
- curl -H "Accept: text/plain" -X POST -d 'experimentId=testWFInstanceID&workflowInstanceId=testWFInstanceID&executionStatus=STARTED&statusUpdateTime=2012-10-23 00:00:00' http://localhost:9080/airavata-registry/registry/api/update/workflowinstancestatus/experimentid
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/workflowinstancestatus?instanceId=testWFInstanceID'
- curl -H "Accept: text/plain" -X POST -d 'nodeID=TempConvertSoap_FahrenheitToCelsius&workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&data=testInputdata' http://localhost:9080/airavata-registry/registry/api/update/workflownodeinput
- curl -H "Accept: text/plain" -X POST -d 'nodeID=TempConvertSoap_FahrenheitToCelsius&workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&data=testOutputdata' http://localhost:9080/airavata-registry/registry/api/update/workflownodeoutput
-
-
-****************** Experiment Data *************************************
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/experiment?experimentId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4'
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/experimentId/user?username=admin'
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/experiment/user?username=admin'
- curl -H "Accept: text/plain" -X POST -d 'workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&nodeId=TempConvertSoap_FahrenheitToCelsius&executionStatus=STARTED' http://localhost:9080/airavata-registry/registry/api/update/workflownode/status
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/workflownode/status?workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&nodeId=TempConvertSoap_FahrenheitToCelsius'
- curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/workflownode/starttime?workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&nodeId=TempConvertSoap_FahrenheitToCelsius'
-
-
-
-********* Sample JSON message for Application and service *****************
-
-{
- "name":"Tesing",
- "cpuCount":"12",
- "hostdescName":"localhost",
- "executablePath":"cccc",
- "workingDir":"dddd"
- "maxMemory":"0",
- "maxWallTime":"0",
- "minMemory":"0",
- "nodeCount":"1",
- "processorsPerNode":"12",
- "serviceDescriptor":{
- "serviceName":"service1",
- "inputParams":[
- {
- "dataType":"input",
- "description":"myinput",
- "name":"myinput",
- "type":"String"
- },
- {
- "dataType":"input",
- "description":"myinput",
- "name":"myinput",
- "type":"String"
- }
- ],
- "outputParams":[
- {
- "dataType":"output",
- "description":"myoutput",
- "name":"myoutput",
- "type":"String"
- },
- {
- "dataType":"output",
- "description":"my output",
- "name":"myoutput",
- "type":"String"
- }
- ]
- }
-}
-
-*** Sample XML message to create application and service
-
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><application><applicationName>Testing</applicationName><cpuCount>0</cpuCount><hostdescName>localhost</hostdescName><maxMemory>0</maxMemory><maxWallTime>0</maxWallTime><minMemory>0</minMemory><nodeCount>0</nodeCount><processorsPerNode>0</processorsPerNode><serviceDesc><inputParams><dataType>input</dataType><description>my input</description><name>myinput</name><type>String</type></inputParams><inputParams><dataType>input</dataType><description>my input</description><name>myinput</name><type>String</type></inputParams><outputParams><dataType>output</dataType><description>my output</description><name>myoutput</name><type>String</type></outputParams><outputParams><dataType>output</dataType><description>my output</description><name>myoutput</name><type>String</type></outputParams></serviceDesc></application>
-
-
-
-
-
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/rest/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest/webapp/pom.xml b/modules/rest/webapp/pom.xml
deleted file mode 100644
index 4f3fb4f..0000000
--- a/modules/rest/webapp/pom.xml
+++ /dev/null
@@ -1,257 +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/xsd/maven-4.0.0.xsd">
-
- <parent>
- <groupId>org.apache.airavata</groupId>
- <artifactId>rest</artifactId>
- <version>0.12-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>airavata-rest-service-webapp</artifactId>
- <packaging>war</packaging>
- <name>airavata-rest-service-webapp</name>
- <build>
- <finalName>airavata-rest-service-webapp</finalName>
- <plugins>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <version>${cargo.version}</version>
- <configuration>
- <wait>true</wait>
- <configuration>
- <properties>
- <cargo.servlet.port>9080</cargo.servlet.port>
- <cargo.tomcat.ajp.port>9009</cargo.tomcat.ajp.port>
- <cargo.rmi.port>9099</cargo.rmi.port>
- <cargo.jvmargs>
- <![CDATA[-Xdebug -Xrunjdwp:transport=dt_socket,address=${cargo.debug.address},server=y,suspend=${cargo.debug.suspend} -noverify ${javaagent}]]>
- </cargo.jvmargs>
- <cargo.tomcat.context.reloadable>true</cargo.tomcat.context.reloadable>
- </properties>
- <home>${project.build.directory}/tomcat6x</home>
- <deployables>
- <deployable>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-rest-service-webapp</artifactId>
- <type>war</type>
- <properties>
- <context>/airavata</context>
- </properties>
- </deployable>
- </deployables>
- </configuration>
- <container>
- <containerId>tomcat6x</containerId>
- <timeout>180000</timeout>
- <zipUrlInstaller>
- <url>
- http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32.tar.gz
- </url>
- </zipUrlInstaller>
- <systemProperties>
-
- </systemProperties>
- </container>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-servlet</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-multipart</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <!--dependency>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-grizzly2</artifactId>
- <version>${jersey.version}</version>
- <scope>test</scope>
- </dependency-->
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <!--dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- <version>${jersey.version}</version>
- </dependency-->
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>1.3.168</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.2.3-1</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-xc</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.ebaysf.web</groupId>
- <artifactId>cors-filter</artifactId>
- <version>${ebay.cors.filter}</version>
- </dependency>
-
- <!-- Airavata -->
- <!--dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-gfac-schema-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-security</artifactId>
- <version>${project.version}</version>
- </dependency-->
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-jpa-registry</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-credential-store</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>edu.uiuc.ncsa.myproxy</groupId>
- <artifactId>oa4mp-client-oauth1</artifactId>
- <version>${oa4mp.version}</version>
- <exclusions>
- <exclusion>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- </exclusion>
- <exclusion>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-rest-mappings</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion> <!-- declare the exclusion here -->
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-rest-services</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion> <!-- declare the exclusion here -->
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- Logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
- </dependencies>
- <properties>
- <jersey.version>1.13</jersey.version>
- <grizzly.version>2.0.0-M3</grizzly.version>
- <!--project.build.sourceEncoding>UTF-8</project.build.sourceEncoding-->
- <cargo.version>1.2.1</cargo.version>
- <!-- if you want a remote debugging on a different a address override on
- command line with -Dcargo.debug.addres=xxxx -->
- <cargo.debug.address>5000</cargo.debug.address>
- <!-- if you want to start remote debugging session suspended override on
- command line with -Dcargo.debug.suspend=y -->
- <cargo.debug.suspend>n</cargo.debug.suspend>
- <javaagent />
- </properties>
-</project>
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/rest/webapp/src/main/resources/authenticators.xml
----------------------------------------------------------------------
diff --git a/modules/rest/webapp/src/main/resources/authenticators.xml b/modules/rest/webapp/src/main/resources/authenticators.xml
deleted file mode 100644
index b0523ff..0000000
--- a/modules/rest/webapp/src/main/resources/authenticators.xml
+++ /dev/null
@@ -1,89 +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 <specificConfigurations> tags.
-
-The "enabled parameter at root level will say whether authenticators are enabled or not.
--->
-
-<authenticators enabled="true">
- <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:1527/persistent_data;create=false</jdbcUrl>
- <userName>airavata</userName>
- <password>airavata</password>
- <databaseDriver>org.apache.derby.jdbc.ClientDriver</databaseDriver>
- <sessionTable>Persons</sessionTable>
- <sessionColumn>sessionId</sessionColumn>
- <comparingColumn>sessionId</comparingColumn>
- </database>
- </specificConfigurations>
- </authenticator>
-
- <authenticator name="basicAccessAuthenticator" class="org.apache.airavata.services.registry.rest.security.basic.BasicAccessAuthenticator"
- enabled="true" priority="8" 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:1527/persistent_data;create=false</jdbcUrl>
- <userName>airavata</userName>
- <password>airavata</password>
- <databaseDriver>org.apache.derby.jdbc.ClientDriver</databaseDriver>
- <userTableName>Users</userTableName>
- <passwordHashMethod>SHA</passwordHashMethod>
- <userNameColumnName>user_name</userNameColumnName>
- <passwordColumnName>password</passwordColumnName>
- </database>
- <!--For MySQL-->
- <!--database>
- <jdbcUrl>jdbc:mysql://localhost:3306/persistent_data</jdbcUrl>
- <userName>airavata</userName>
- <password>airavata</password>
- <databaseDriver>com.mysql.jdbc.Driver</databaseDriver>
- <userTableName>Users</userTableName>
- <passwordHashMethod>SHA</passwordHashMethod>
- <userNameColumnName>user_name</userNameColumnName>
- <passwordColumnName>password</passwordColumnName>
- </database-->
- </specificConfigurations>
- </authenticator>
-
- <authenticator name="basicAccessAuthenticatorLdap" class="org.apache.airavata.services.registry.rest.security.basic.BasicAccessAuthenticator"
- 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=users,ou=system</userDNTemplate>
- </ldap>
- </specificConfigurations>
- </authenticator>
-
-</authenticators>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/rest/webapp/src/main/resources/credential-store/airavata.jks
----------------------------------------------------------------------
diff --git a/modules/rest/webapp/src/main/resources/credential-store/airavata.jks b/modules/rest/webapp/src/main/resources/credential-store/airavata.jks
deleted file mode 100644
index bd6d8fe..0000000
Binary files a/modules/rest/webapp/src/main/resources/credential-store/airavata.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/rest/webapp/src/main/resources/credential-store/client.xml
----------------------------------------------------------------------
diff --git a/modules/rest/webapp/src/main/resources/credential-store/client.xml b/modules/rest/webapp/src/main/resources/credential-store/client.xml
deleted file mode 100644
index f7cc328..0000000
--- a/modules/rest/webapp/src/main/resources/credential-store/client.xml
+++ /dev/null
@@ -1,38 +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. -->
-
-<config>
- <client name="acs">
- <logging
- logFileName="../logs/oa4mp.log"
- logName="oa4mp"
- logSize="1000000"
- logFileCount="2"
- debug="true"/>
- <id>myproxy:oa4mp,2012:/client/24c45c2eb65d93231d02d423e94d0362</id>
- <serviceUri>https://portal.xsede.org/oauth</serviceUri>
- <!--callbackUri>https://156.56.179.104:8443/client/pages/client-success.jsp</callbackUri-->
- <callbackUri>https://192.168.0.13:8443/airavata/callback</callbackUri>
- <lifetime>864000</lifetime>
- <!--publicKeyFile>/Users/thejaka/manager-server/webapps/airavata-registry/WEB-INF/classes/credential-store/oauth-pubkey.pem</publicKeyFile-->
- <publicKeyFile>../webapps/airavata/WEB-INF/classes/credential-store/oauth-pubkey.pem</publicKeyFile>
- <!--privateKeyFile>/Users/thejaka/manager-server/webapps/airavata-registry/WEB-INF/classes/credential-store/oauth-privkey.pk8</privateKeyFile-->
- <privateKeyFile>../webapps/airavata/WEB-INF/classes/credential-store/oauth-privkey.pk8</privateKeyFile>
- </client>
-
- <credential-store>
- <successUri>/credential-store/success.jsp</successUri>
- <errorUri>/credential-store/error.jsp</errorUri>
- <redirectUri>/credential-store/show-redirect.jsp</redirectUri>
- </credential-store>
-
-</config>
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/rest/webapp/src/main/resources/credential-store/oauth-privkey.pk8
----------------------------------------------------------------------
diff --git a/modules/rest/webapp/src/main/resources/credential-store/oauth-privkey.pk8 b/modules/rest/webapp/src/main/resources/credential-store/oauth-privkey.pk8
deleted file mode 100644
index 551e2be..0000000
--- a/modules/rest/webapp/src/main/resources/credential-store/oauth-privkey.pk8
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDJAc14swfpUZOb
-T9VFGIgSGfBBnfJXcf/Pa9s6igXQBevRohJ1FdQ9y3kaLDXngVh6/xIKAgfCu10O
-7o2ZNi7K5NS37LDYehw+fzrRlOVHLOkHQ/XVvJfMENPv8emMmAkiFK1WxeITKBC8
-GkrbQGy3k7kfo8om2op7Tc0wAUZOcOrd0VQE5yUeF7ODmg7YwYgILlNSHTrK9rmz
-5WvJRwAnouAWQZxir/+Zzb9ynMK/2AraOWaHHO7V41B/JU55lqLI8DZOrLk5ZAAN
-OXEMIFAoeSyRbQMDDJ0QzMjRovuz15IaEMpn83p4q7pAwPK7UkK3yO5bWP15qiM2
-daWVJv55AgMBAAECggEAEzcZ5lTvB63lt24tTBqpP1m9bvhjZ1qdgr2jynfRUG6Q
-eYzNyOWaUYH3BLp/OK9TvwZNOimxhjsVDU1euevFE15Gu4Jj8X3S32KYQ9rBBEnV
-yP0FLjaGKFrfd8ufcPJDxT9GxsnJ79zfpKu6xjTlb7MuekjVFVvE6z6nw9QLXYog
-bdjPFgPKWynl5ALNjenZMDFgCSIvdVcjgwdOLpDuPYdfD+JBZVFg+YCXaEQKkpXZ
-AHTuDO4Zq5JuUkHr3I+MwhCvIwgImQ/yfw0Vn+kj+WIrY6lyyO58NmAA7FXefPmC
-B0IKsdWFqXDzJMm15Kn4h4IeudR55UmRSIgk17N60QKBgQDuDlvxHBUUJI/7OkFB
-/bvqF8K+11PUpOIBxhgOw/76tgX4penYGmqVDDpYBO+ae+kKfASQIp91uOJc3JeH
-itm7k6HIzHqSJFSTXkRO3KxHgkyYo8o2IWXWYPhPt93edC3AKqOUMlrNXdyfuAPx
-Nh4xCvhgOZDxrQoNldzzjaHuHQKBgQDYKIcfiQuVsjc4Opu1fn57fagrPUfNOM/p
-u5chh+mOb2GhTzDa0I4OiWz05fSho/uakYgiXE/D0oIe4S9sCTMai+pjtp1jt6sg
-ZO7QLPhj6ct1VF6VYButHOwpKS70MFcdihYOIP49Gonw/P8Xu+HY0Qhc760rjwcI
-ga/4r5zTDQKBgAgERcZd2rvd61dbg90UDWL5v94rZDBSCSZkJGVC5nBM9vCDrddQ
-NGymh8R1DhiWuadXu9OaxuHxAvZ7m0K+Q0zU0OrxL+OCA7MexpAdUFPsKGYvhdzC
-zSomA9aza25VXUEObonMFFC8K3TZfpB98RBXvTuIVMA+worolBNDnsNlAoGBAI4B
-uhvGnfy/czWWk1sd+hxJBiU6AiTZ0QW9/uDBeHfhxqMB8peeceUs9Y7CT/+tSotW
-Vrg0Kxb8Ag4lZFE2jgM/rkHJ5AZx0JPcm2PaV2jUXJz9S5IY7LXDDYdRDg7Qfzrh
-z/GCTWR5Pew7WZ8PCKW3ViYwM3UtZrJ4+NGJFZ81AoGBAIPOt5Ge30dEGLh0UUBg
-y60MUR6jcUDmIl8x88h+O97qMjf5fsVshOR+GhFKSYQdibDo3HO+sRKS6pii9v5e
-IXZD0wUr2HznpGXrAn7CmHEM7ms0TBfy4IOkewrYAhlK/yilfkmjyS8tjLlRB2Kv
-xHv7LOgh04rFHhYdztDWPj3z
------END PRIVATE KEY-----
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/rest/webapp/src/main/resources/credential-store/oauth-pubkey.pem
----------------------------------------------------------------------
diff --git a/modules/rest/webapp/src/main/resources/credential-store/oauth-pubkey.pem b/modules/rest/webapp/src/main/resources/credential-store/oauth-pubkey.pem
deleted file mode 100644
index 1c18768..0000000
--- a/modules/rest/webapp/src/main/resources/credential-store/oauth-pubkey.pem
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyQHNeLMH6VGTm0/VRRiI
-EhnwQZ3yV3H/z2vbOooF0AXr0aISdRXUPct5Giw154FYev8SCgIHwrtdDu6NmTYu
-yuTUt+yw2HocPn860ZTlRyzpB0P11byXzBDT7/HpjJgJIhStVsXiEygQvBpK20Bs
-t5O5H6PKJtqKe03NMAFGTnDq3dFUBOclHhezg5oO2MGICC5TUh06yva5s+VryUcA
-J6LgFkGcYq//mc2/cpzCv9gK2jlmhxzu1eNQfyVOeZaiyPA2Tqy5OWQADTlxDCBQ
-KHkskW0DAwydEMzI0aL7s9eSGhDKZ/N6eKu6QMDyu1JCt8juW1j9eaojNnWllSb+
-eQIDAQAB
------END PUBLIC KEY-----
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/rest/webapp/src/main/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/modules/rest/webapp/src/main/resources/log4j.xml b/modules/rest/webapp/src/main/resources/log4j.xml
deleted file mode 100644
index 4cd38c8..0000000
--- a/modules/rest/webapp/src/main/resources/log4j.xml
+++ /dev/null
@@ -1,49 +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.
-
- $Id$
--->
-<!DOCTYPE log4j:configuration PUBLIC "-//LOGGER" "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
- <!-- Appenders -->
- <appender name="console" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%-5p: %c - %m%n" />
- </layout>
- </appender>
-
- <!-- Jersey logger -->
- <logger name="com.sun.jersey">
- <level value="info" />
- </logger>
-
- <!-- Airavata logger -->
- <logger name="org.apache.airavata">
- <level value="info" />
- </logger>
-
- <!-- Root Logger -->
- <root>
- <priority value="info" />
- <appender-ref ref="console" />
- </root>
-
-</log4j:configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml b/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 0d446ec..0000000
--- a/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,200 +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 web.xml file is not required when using Servlet 3.0 container,
- see implementation details http://jersey.java.net/nonav/documentation/latest/jax-rs.html#d4e194 -->
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/javaee"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- id="WebApp_ID" version="2.5">
- <listener>
- <listener-class>org.apache.airavata.rest.mappings.utils.RegistryListener</listener-class>
- </listener>
- <listener>
- <listener-class>org.apache.airavata.credential.store.servlet.CredentialBootstrapper</listener-class>
- </listener>
-
- <context-param>
- <param-name>oa4mp:client.config.file</param-name>
- <param-value>${catalina.home}/webapps/airavata/WEB-INF/classes/credential-store/client.xml</param-value>
- <!--param-value>
- /home/amila/development/tools/apache-tomcat-7.0.29/webapps/airavata/WEB-INF/classes/credential-store/client.xml
- </param-value-->
-
- </context-param>
-
- <!-- Credential store parameters -->
- <context-param>
- <param-name>credential-store-jdbc-url</param-name>
- <param-value>jdbc:mysql://localhost/airavata</param-value>
- </context-param>
-
- <context-param>
- <param-name>credential-store-db-user</param-name>
- <param-value>root</param-value>
- </context-param>
-
- <context-param>
- <param-name>credential-store-db-password</param-name>
- <param-value>root123</param-value>
- </context-param>
-
- <context-param>
- <param-name>credential-store-db-driver</param-name>
- <param-value>com.mysql.jdbc.Driver</param-value>
- </context-param>
-
- <servlet>
- <servlet-name>Airavata Registry Service</servlet-name>
- <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
- <init-param>
- <param-name>com.sun.jersey.config.property.packages</param-name>
- <param-value>org.apache.airavata.services.registry.rest;org.apache.airavata.services.experiment;org.codehaus.jackson.jaxrs</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>Airavata Experiment Service</servlet-name>
- <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
- <init-param>
- <param-name>com.sun.jersey.config.property.packages</param-name>
- <param-value>org.apache.airavata.services.experiment;org.codehaus.jackson.jaxrs</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet>
- <servlet-name>Airavata Server Configuration Service</servlet-name>
- <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
- <init-param>
- <param-name>com.sun.jersey.config.property.packages</param-name>
- <param-value>org.apache.airavata.services.server;org.codehaus.jackson.jaxrs</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <!-- ========================= Security Related Configurations go here ================================== -->
-
- <filter>
- <filter-name>CORS Filter</filter-name>
- <filter-class>org.ebaysf.web.cors.CORSFilter</filter-class>
- <init-param>
- <description>A comma separated list of allowed origins. Note: An '*' cannot be used for an allowed origin when using credentials.</description>
- <param-name>cors.allowed.origins</param-name>
- <param-value>*</param-value>
- </init-param>
- <init-param>
- <param-name>cors.allowed.methods</param-name>
- <param-value>GET,POST,HEAD,OPTIONS,PUT</param-value>
- </init-param>
- <init-param>
- <param-name>cors.allowed.headers</param-name>
- <param-value>Content-Type,X-Requested-With,accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers,Authorization</param-value>
- </init-param>
- <init-param>
- <param-name>cors.exposed.headers</param-name>
- <param-value></param-value>
- </init-param>
- <init-param>
- <param-name>cors.support.credentials</param-name>
- <param-value>true</param-value>
- </init-param>
- <init-param>
- <param-name>cors.logging.enabled</param-name>
- <param-value>false</param-value>
- </init-param>
- <init-param>
- <param-name>cors.preflight.maxage</param-name>
- <param-value>1800</param-value>
- </init-param>
- <init-param>
- <param-name>cors.request.decorate</param-name>
- <param-value>true</param-value>
- </init-param>
- </filter>
-
- <filter>
- <filter-name>AuthenticationFilter</filter-name>
- <filter-class>org.apache.airavata.services.registry.rest.security.HttpAuthenticatorFilter</filter-class>
- <init-param>
- <param-name>authenticatorConfigurations</param-name>
- <param-value>authenticators.xml</param-value>
- </init-param>
- </filter>
-
- <filter-mapping>
- <filter-name>CORS Filter</filter-name>
- <url-pattern>/user-store/*</url-pattern>
- <url-pattern>/services/registry/*</url-pattern>
- <url-pattern>/services/experiment/*</url-pattern>
- <url-pattern>/services/server/*</url-pattern>
- </filter-mapping>
-
- <filter-mapping>
- <filter-name>AuthenticationFilter</filter-name>
- <url-pattern>/user-store/*</url-pattern>
- <url-pattern>/services/registry/*</url-pattern>
- <url-pattern>/services/experiment/*</url-pattern>
- <url-pattern>/services/server/*</url-pattern>
- </filter-mapping>
-
- <!-- ================================ End Security Related Configurations =============================== -->
-
- <servlet-mapping>
- <servlet-name>Airavata Registry Service</servlet-name>
- <url-pattern>/services/registry/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>Airavata Experiment Service</servlet-name>
- <url-pattern>/services/experiment/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>Airavata Server Configuration Service</servlet-name>
- <url-pattern>/services/server/*</url-pattern>
- </servlet-mapping>
-
- <!-- Credential Store Configurations -->
- <servlet>
- <servlet-name>credential-store-start</servlet-name>
- <!--internal name of the servlet-->
- <servlet-class>org.apache.airavata.credential.store.servlet.CredentialStoreStartServlet</servlet-class>
-
- <load-on-startup>1</load-on-startup>
- <!--load as soon as tomcat starts?-->
- </servlet>
-
- <servlet-mapping>
- <servlet-name>credential-store-start</servlet-name>
- <!--the servlet-name above-->
- <url-pattern>/acs-start-servlet</url-pattern>
- <!--what needs to be in the url, so http://foo.org/client/simple-->
- </servlet-mapping>
-
- <servlet>
- <servlet-name>callback</servlet-name>
- <!--internal name of the servlet-->
- <servlet-class>org.apache.airavata.credential.store.servlet.CredentialStoreCallbackServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- <!--load as soon as tomcat starts?-->
- </servlet>
-
- <servlet-mapping>
- <servlet-name>callback</servlet-name>
- <!--the servlet-name above-->
- <url-pattern>/callback</url-pattern>
- <!--what needs to be in the url, so http://foo.org/client/simple-->
- </servlet-mapping>
-</web-app>
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/rest/webapp/src/main/webapp/acs/index.jsp
----------------------------------------------------------------------
diff --git a/modules/rest/webapp/src/main/webapp/acs/index.jsp b/modules/rest/webapp/src/main/webapp/acs/index.jsp
deleted file mode 100644
index e7626fa..0000000
--- a/modules/rest/webapp/src/main/webapp/acs/index.jsp
+++ /dev/null
@@ -1,44 +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.
- --%>
-
-<html>
-<body>
-<h2>Sample Portal</h2>
-<p>This demonstrates how portal can use Credential Store to obtain community credentials ...</p>
-<form name="input" action="../acs-start-servlet" method="post">
-
- <table border="0">
- <tr>
- <td>Gateway Name</td>
- <td><input type="text" name="gatewayName"></td>
- </tr>
- <tr>
- <td>Portal Username</td>
- <td><input type="text" name="portalUserName"></td>
- </tr>
- <tr>
- <td>Contact Email</td>
- <td><input type="text" name="email"></td>
- </tr>
- </table>
-
- <input type="submit" value="Submit">
-</form>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/rest/webapp/src/main/webapp/credential-store/error.jsp
----------------------------------------------------------------------
diff --git a/modules/rest/webapp/src/main/webapp/credential-store/error.jsp b/modules/rest/webapp/src/main/webapp/credential-store/error.jsp
deleted file mode 100644
index adc430d..0000000
--- a/modules/rest/webapp/src/main/webapp/credential-store/error.jsp
+++ /dev/null
@@ -1,53 +0,0 @@
-<%@ page import="org.apache.airavata.credential.store.util.CredentialStoreConstants" %>
-<%--
- ~ 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.
- --%>
-
-
-<%
- String gatewayName = request.getParameter(CredentialStoreConstants.GATEWAY_NAME_QUERY_PARAMETER);
- String portalUserName = request.getParameter(CredentialStoreConstants.PORTAL_USER_QUERY_PARAMETER);
- Throwable exception = (Throwable) request.getAttribute("exception");
-
-%>
-
-<html>
-<body>
-<h1>Credential Store</h1>
-<p>An error occurred while processing</p>
-<p>
- Gateway Name - <%=gatewayName%>. Portal user name - <%=portalUserName%>.
- Exception -
-
-</p>
-
-<p>
- <%
-
- out.println("Exception - " + exception.getMessage());
- out.println();
- StackTraceElement[] elements = exception.getStackTrace();
- for (StackTraceElement element : elements) {
- out.print(" ");
- out.println(element.toString());
- }
-
- %>
-</p>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/rest/webapp/src/main/webapp/credential-store/password-credentials.jsp
----------------------------------------------------------------------
diff --git a/modules/rest/webapp/src/main/webapp/credential-store/password-credentials.jsp b/modules/rest/webapp/src/main/webapp/credential-store/password-credentials.jsp
deleted file mode 100644
index 59a1e04..0000000
--- a/modules/rest/webapp/src/main/webapp/credential-store/password-credentials.jsp
+++ /dev/null
@@ -1,33 +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.
- --%>
-
-<html>
-<body>
-<h2>Store Passwords</h2>
-<p>This demonstrates how portal can use Credential Store to obtain community credentials ...</p>
-<form name="input" action="../airavata-registry-rest-services/credential-store" method="post">
-
- Gateway Name : <input type="text" name="gatewayName"><br>
- Portal Username: <input type="text" name="portalUserName"><br>
- Contact Email: <input type="text" name="email">
-
- <input type="submit" value="Submit">
-</form>
-</body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/rest/webapp/src/main/webapp/credential-store/show-redirect.jsp
----------------------------------------------------------------------
diff --git a/modules/rest/webapp/src/main/webapp/credential-store/show-redirect.jsp b/modules/rest/webapp/src/main/webapp/credential-store/show-redirect.jsp
deleted file mode 100644
index 84b54cf..0000000
--- a/modules/rest/webapp/src/main/webapp/credential-store/show-redirect.jsp
+++ /dev/null
@@ -1,44 +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.
- --%>
-
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-
-<%
- String redirectUrlInRequest = (String) request.getAttribute("redirectUrl");
-%>
-
-<html>
-<head>
- <script type="text/javascript">
- <!--
- function redirect(){
- window.location = "<%=redirectUrlInRequest%>"
- }
- //-->
- </script>
-</head>
-<body onLoad="setTimeout('redirect()', 1000)">
-<h2>You will be now redirect to MyProxy portal !</h2>
-<p>
- If your browser didn't redirect to MyProxy Portal within 1 minute click following link,
- <br><br> <a href="<%=redirectUrlInRequest%>"><%=redirectUrlInRequest%></a>
-</p>
-
-</body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/rest/webapp/src/main/webapp/credential-store/success.jsp
----------------------------------------------------------------------
diff --git a/modules/rest/webapp/src/main/webapp/credential-store/success.jsp b/modules/rest/webapp/src/main/webapp/credential-store/success.jsp
deleted file mode 100644
index f2964d0..0000000
--- a/modules/rest/webapp/src/main/webapp/credential-store/success.jsp
+++ /dev/null
@@ -1,25 +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.
- --%>
-
-<html>
-<body>
-<h1>Credential Store</h1>
-<p>Certificate Successfully Stored !</p>
-</body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/rest/webapp/src/main/webapp/images/airavata-logo-2.png
----------------------------------------------------------------------
diff --git a/modules/rest/webapp/src/main/webapp/images/airavata-logo-2.png b/modules/rest/webapp/src/main/webapp/images/airavata-logo-2.png
deleted file mode 100644
index 4baf51b..0000000
Binary files a/modules/rest/webapp/src/main/webapp/images/airavata-logo-2.png and /dev/null differ