Author: lahiru
Date: Thu Nov 15 19:54:51 2012
New Revision: 1409955
URL: http://svn.apache.org/viewvc?rev=1409955&view=rev
Log:
Applying the patch given by amila for
https://issues.apache.org/jira/browse/AIRAVATA-644.
Thanks Amila for the contribution.
Modified:
airavata/trunk/modules/airavata-rest-services/pom.xml
airavata/trunk/modules/airavata-rest-services/src/main/resources/airavata-server.properties
airavata/trunk/modules/airavata-rest-services/src/main/resources/authenticators.xml
airavata/trunk/modules/airavata-rest-services/src/main/webapp/WEB-INF/web.xml
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql
Modified: airavata/trunk/modules/airavata-rest-services/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-rest-services/pom.xml?rev=1409955&r1=1409954&r2=1409955&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-rest-services/pom.xml (original)
+++ airavata/trunk/modules/airavata-rest-services/pom.xml Thu Nov 15 19:54:51
2012
@@ -71,6 +71,11 @@
</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>
Modified:
airavata/trunk/modules/airavata-rest-services/src/main/resources/airavata-server.properties
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-rest-services/src/main/resources/airavata-server.properties?rev=1409955&r1=1409954&r2=1409955&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-rest-services/src/main/resources/airavata-server.properties
(original)
+++
airavata/trunk/modules/airavata-rest-services/src/main/resources/airavata-server.properties
Thu Nov 15 19:54:51 2012
@@ -52,12 +52,12 @@ registry.jdbc.password=airavata
start.derby.server.mode=true
#for mysql
-registry.jdbc.driver=com.mysql.jdbc.Driver
-registry.jdbc.url=jdbc:mysql://localhost:3306/persistent_data
+#registry.jdbc.driver=com.mysql.jdbc.Driver
+#registry.jdbc.url=jdbc:mysql://localhost:3306/persistent_data
#for derby
-#registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#registry.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata
+registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
+registry.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata
###########################################################################
# Airavata Workflow Interpreter Configurations
Modified:
airavata/trunk/modules/airavata-rest-services/src/main/resources/authenticators.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-rest-services/src/main/resources/authenticators.xml?rev=1409955&r1=1409954&r2=1409955&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-rest-services/src/main/resources/authenticators.xml
(original)
+++
airavata/trunk/modules/airavata-rest-services/src/main/resources/authenticators.xml
Thu Nov 15 19:54:51 2012
@@ -16,10 +16,10 @@ The "enabled parameter at root level wil
<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:h2:../../src/test/resources/testdb/test</jdbcUrl>
- <userName>sa</userName>
- <password>sa</password>
- <databaseDriver>org.h2.Driver</databaseDriver>
+
<jdbcUrl>jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata</jdbcUrl>
+ <userName>airavata</userName>
+ <password>airavata</password>
+
<databaseDriver>org.apache.derby.jdbc.ClientDriver</databaseDriver>
<sessionTable>Persons</sessionTable>
<sessionColumn>sessionId</sessionColumn>
<comparingColumn>sessionId</comparingColumn>
@@ -28,23 +28,23 @@ The "enabled parameter at root level wil
</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">
+ 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:mysql://localhost/airavata</jdbcUrl>
- <userName>root</userName>
- <password>root123</password>
- <databaseDriver>com.mysql.jdbc.Driver</databaseDriver>
- <userTableName>AIRAVATA_USER</userTableName>
- <userNameColumnName>USERID</userNameColumnName>
- <passwordColumnName>PASSWORD</passwordColumnName>
+
<jdbcUrl>jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata</jdbcUrl>
+ <userName>airavata</userName>
+ <password>airavata</password>
+
<databaseDriver>org.apache.derby.jdbc.ClientDriver</databaseDriver>
+ <userTableName>Users</userTableName>
+ <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="8"
userstore="org.apache.airavata.security.userstore.LDAPUserStore">
+ enabled="true" priority="6"
userstore="org.apache.airavata.security.userstore.LDAPUserStore">
<specificConfigurations>
<ldap>
<!--
Modified:
airavata/trunk/modules/airavata-rest-services/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-rest-services/src/main/webapp/WEB-INF/web.xml?rev=1409955&r1=1409954&r2=1409955&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-rest-services/src/main/webapp/WEB-INF/web.xml
(original)
+++
airavata/trunk/modules/airavata-rest-services/src/main/webapp/WEB-INF/web.xml
Thu Nov 15 19:54:51 2012
@@ -28,7 +28,7 @@
<filter-mapping>
<filter-name>AuthenticationFilter</filter-name>
- <url-pattern>/api/*</url-pattern>
+ <url-pattern>/*</url-pattern>
</filter-mapping>
<!-- ================================ End Security Related Configurations
=============================== -->
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql?rev=1409955&r1=1409954&r2=1409955&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql
Thu Nov 15 19:54:51 2012
@@ -191,4 +191,7 @@ create table Gram_Data
FOREIGN KEY (workflow_instanceID) REFERENCES
Workflow_Data(workflow_instanceID) ON DELETE CASCADE
);
+insert into Users values ('admin', 'admin');
+
+
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql?rev=1409955&r1=1409954&r2=1409955&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql
Thu Nov 15 19:54:51 2012
@@ -40,6 +40,8 @@ create table Users
PRIMARY KEY(user_name)
);
+insert into Users
+
create table Gateway_Worker
(
gateway_name varchar(255),
@@ -190,4 +192,6 @@ create table Gram_Data
FOREIGN KEY (workflow_instanceID) REFERENCES
Workflow_Data(workflow_instanceID) ON DELETE CASCADE
);
+insert into Users values ('admin', 'admin');
+
