Author: amilaj
Date: Mon Jul 8 22:44:41 2013
New Revision: 1501000
URL: http://svn.apache.org/r1501000
Log:
Fixing the context issue in webapp and stand a lone server. Also fixing xbaya
connection issue
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
airavata/trunk/modules/commons/utils/src/test/java/org/apache/airavata/common/utils/ApplicationSettingsTest.java
airavata/trunk/modules/commons/utils/src/test/resources/airavata-server.properties
airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
airavata/trunk/modules/distribution/airavata-server/pom.xml
airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java?rev=1501000&r1=1500999&r2=1501000&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
Mon Jul 8 22:44:41 2013
@@ -100,7 +100,7 @@ public class AiravataClient extends Obse
private static volatile boolean registryServiceStarted = false;
private static int WAIT_TIME_PERIOD = 3 * 1000;
- private static int WAIT_ITERATIONS = 19;
+ private static int WAIT_ITERATIONS = 8;
private static final Version API_VERSION = new Version("Airavata", 0, 8,
null, null, null);
@@ -147,7 +147,9 @@ public class AiravataClient extends Obse
@Override
public void initialize() throws AiravataAPIInvocationException {
- waitTillRegistryServiceStarts();
+ if (AiravataUtils.isServer()) {
+ waitTillRegistryServiceStarts();
+ }
try {
if (!configCreated) {
Modified:
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java?rev=1501000&r1=1500999&r2=1501000&view=diff
==============================================================================
---
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
(original)
+++
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
Mon Jul 8 22:44:41 2013
@@ -47,7 +47,7 @@ public abstract class ApplicationSetting
protected static final String TRUST_STORE_PATH="trust.store";
protected static final String TRUST_STORE_PASSWORD="trust.store.password";
- private static final String REGULAR_EXPRESSION = "\\$\\{[a-zA-Z]*\\}";
+ private static final String REGULAR_EXPRESSION = "\\$\\{[a-zA-Z.-]*\\}";
private final static Logger logger =
LoggerFactory.getLogger(ApplicationSettings.class);
Modified:
airavata/trunk/modules/commons/utils/src/test/java/org/apache/airavata/common/utils/ApplicationSettingsTest.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/src/test/java/org/apache/airavata/common/utils/ApplicationSettingsTest.java?rev=1501000&r1=1500999&r2=1501000&view=diff
==============================================================================
---
airavata/trunk/modules/commons/utils/src/test/java/org/apache/airavata/common/utils/ApplicationSettingsTest.java
(original)
+++
airavata/trunk/modules/commons/utils/src/test/java/org/apache/airavata/common/utils/ApplicationSettingsTest.java
Mon Jul 8 22:44:41 2013
@@ -45,5 +45,13 @@ public class ApplicationSettingsTest ext
}
+ public void testGetAbsoluteSettingWithSpecialCharacters() throws Exception
{
+
+ System.setProperty(AiravataUtils.EXECUTION_MODE, "SERVER");
+ String url =
ApplicationSettings.getAbsoluteSetting("registry.service.wsdl2");
+
Assert.assertEquals("http://localhost:8080/axis2/services/RegistryService?wsdl";,
url);
+
+ }
+
}
Modified:
airavata/trunk/modules/commons/utils/src/test/resources/airavata-server.properties
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/src/test/resources/airavata-server.properties?rev=1501000&r1=1500999&r2=1501000&view=diff
==============================================================================
---
airavata/trunk/modules/commons/utils/src/test/resources/airavata-server.properties
(original)
+++
airavata/trunk/modules/commons/utils/src/test/resources/airavata-server.properties
Mon Jul 8 22:44:41 2013
@@ -140,7 +140,7 @@ msgBox.jdbc.url=jdbc:derby:wsmg;create=t
###########################################################################
#Update the server context root path if airavata server is deployed under a
different context root other than axis2
-#server.context-root=axis2
+server.context-root=axis2
#
# Class which implemented HostScheduler interface. It will determine the which
host to submit the request
@@ -220,3 +220,4 @@ class.registry.accessor=org.apache.airav
#enable.application.job.status.history=true
registry.service.wsdl=http://${ip}:${port}/axis2/services/RegistryService?wsdl
+registry.service.wsdl2=http://localhost:${port}/${server.context-root}/services/RegistryService?wsdl
Modified:
airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties?rev=1501000&r1=1500999&r2=1501000&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
(original)
+++
airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
Mon Jul 8 22:44:41 2013
@@ -65,4 +65,4 @@ trust.store.password=airavata
# To make JPA accessor work you need to add OpenJPA jars and uncomment
jpa.connection.properties
#class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
#jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000
-registry.service.wsdl=http://localhost:8080/axis2/services/RegistryService?wsdl
+#registry.service.wsdl=http://localhost:8080/airavata-server/services/RegistryService?wsdl
Modified: airavata/trunk/modules/distribution/airavata-server/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/pom.xml?rev=1501000&r1=1500999&r2=1501000&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/pom.xml (original)
+++ airavata/trunk/modules/distribution/airavata-server/pom.xml Mon Jul 8
22:44:41 2013
@@ -160,7 +160,7 @@
</fileset>
</copy>
<replace
file="${airavata.webapp.dir}/WEB-INF/classes/airavata-server.properties">
-
<replacetoken>#server.context-root=axis2</replacetoken>
+
<replacetoken>server.context-root=axis2</replacetoken>
<replacevalue>server.context-root=airavata-server</replacevalue>
</replace>
<zip
destfile="${airavata.war.dir}/airavata-server.war"
basedir="${airavata.webapp.dir}" />
Modified:
airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties?rev=1501000&r1=1500999&r2=1501000&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
(original)
+++
airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
Mon Jul 8 22:44:41 2013
@@ -140,7 +140,7 @@ msgBox.jdbc.url=jdbc:derby:wsmg;create=t
###########################################################################
#Update the server context root path if airavata server is deployed under a
different context root other than axis2
-#server.context-root=axis2
+server.context-root=axis2
#
# Class which implemented HostScheduler interface. It will determine the which
host to submit the request
@@ -220,5 +220,5 @@ class.registry.accessor=org.apache.airav
#enable.application.job.status.history=true
#http://localhost:8080/axis2/services/RegistryService?wsdl
-registry.service.wsdl=http://localhost:${port}/axis2/services/RegistryService?wsdl
+registry.service.wsdl=http://localhost:${port}/${server.context-root}/services/RegistryService?wsdl
