Author: scamp
Date: Thu Jun 16 11:13:21 2005
New Revision: 190977
URL: http://svn.apache.org/viewcvs?rev=190977&view=rev
Log: (empty)
Modified:
incubator/muse/trunk/src/ieeedemo/build.xml
incubator/muse/trunk/src/ieeedemo/eprs/weather-client-config-epr.xml
incubator/muse/trunk/src/ieeedemo/eprs/weather-station-1-epr.xml
incubator/muse/trunk/src/ieeedemo/eprs/weather-station-2-epr.xml
incubator/muse/trunk/src/ieeedemo/eprs/weather-station-dir-epr.xml
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/InteropConstants.java
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/InteropRequestUtils.java
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherClientConfig/WeatherClientConfigHome.java
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherClientConfig/WeatherClientConfigResource.java
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/OpStatusChanger.java
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/WeatherStationHome.java
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/WeatherStationResource.java
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/WeatherStationService.java
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStationDir/WeatherStationDirResource.java
Modified: incubator/muse/trunk/src/ieeedemo/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/build.xml?rev=190977&r1=190976&r2=190977&view=diff
==============================================================================
--- incubator/muse/trunk/src/ieeedemo/build.xml (original)
+++ incubator/muse/trunk/src/ieeedemo/build.xml Thu Jun 16 11:13:21 2005
@@ -80,12 +80,12 @@
<target name="deploy"
depends="init"
description="deploys the services to the muse webapp">
-
+ <!--
<mkdir dir="${wsdm.webapp.dir}/epr"/>
<copy todir="${wsdm.webapp.dir}/epr" overwrite="true" verbose="true">
<fileset dir="${eprs.dir}" includes="**/*.xml"/>
</copy>
-
+ -->
<copy todir="${wsdm.webapp.dir}/WEB-INF/classes/wsdl" overwrite="true"
verbose="true">
<fileset dir="${wsdl.dir}" includes="**/*.wsdl"/>
</copy>
Modified: incubator/muse/trunk/src/ieeedemo/eprs/weather-client-config-epr.xml
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/eprs/weather-client-config-epr.xml?rev=190977&r1=190976&r2=190977&view=diff
==============================================================================
--- incubator/muse/trunk/src/ieeedemo/eprs/weather-client-config-epr.xml
(original)
+++ incubator/muse/trunk/src/ieeedemo/eprs/weather-client-config-epr.xml Thu
Jun 16 11:13:21 2005
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<EndpointReference xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing";>
- <Address>http://localhost:8080/muse/services/WeatherClientConfig</Address>
+
<Address>http://192.168.2.123:8080/muse/services/WeatherClientConfig</Address>
<ReferenceProperties>
<svr:ResourceIdentifier
xmlns:svr="http://wsdmdemo.org/service/weather-client-config";>weather-client-config-1</svr:ResourceIdentifier>
</ReferenceProperties>
Modified: incubator/muse/trunk/src/ieeedemo/eprs/weather-station-1-epr.xml
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/eprs/weather-station-1-epr.xml?rev=190977&r1=190976&r2=190977&view=diff
==============================================================================
--- incubator/muse/trunk/src/ieeedemo/eprs/weather-station-1-epr.xml (original)
+++ incubator/muse/trunk/src/ieeedemo/eprs/weather-station-1-epr.xml Thu Jun 16
11:13:21 2005
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<EndpointReference xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing";>
- <Address>http://localhost:8080/muse/services/WeatherStation</Address>
+
<Address>http://192.168.2.190:4400/ettk/wsdm/services/WeatherStationSOAP</Address>
<ReferenceProperties>
<svr:ResourceIdentifier
xmlns:svr="http://wsdmdemo.org/service/weather-station";>weather-station-1</svr:ResourceIdentifier>
</ReferenceProperties>
Modified: incubator/muse/trunk/src/ieeedemo/eprs/weather-station-2-epr.xml
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/eprs/weather-station-2-epr.xml?rev=190977&r1=190976&r2=190977&view=diff
==============================================================================
--- incubator/muse/trunk/src/ieeedemo/eprs/weather-station-2-epr.xml (original)
+++ incubator/muse/trunk/src/ieeedemo/eprs/weather-station-2-epr.xml Thu Jun 16
11:13:21 2005
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<EndpointReference xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing";>
- <Address>http://localhost:8080/muse/services/WeatherStation</Address>
+ <Address>http://192.168.2.123:8080/muse/services/WeatherStation</Address>
<ReferenceProperties>
<svr:ResourceIdentifier
xmlns:svr="http://wsdmdemo.org/service/weather-station";>weather-station-2</svr:ResourceIdentifier>
</ReferenceProperties>
Modified: incubator/muse/trunk/src/ieeedemo/eprs/weather-station-dir-epr.xml
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/eprs/weather-station-dir-epr.xml?rev=190977&r1=190976&r2=190977&view=diff
==============================================================================
--- incubator/muse/trunk/src/ieeedemo/eprs/weather-station-dir-epr.xml
(original)
+++ incubator/muse/trunk/src/ieeedemo/eprs/weather-station-dir-epr.xml Thu Jun
16 11:13:21 2005
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<EndpointReference xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing";>
- <Address>http://localhost:8080/muse/services/WeatherStationDir</Address>
+ <Address>http://192.168.2.123:8080/muse/services/WeatherStationDir</Address>
<ReferenceProperties>
</ReferenceProperties>
Modified:
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/InteropConstants.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/InteropConstants.java?rev=190977&r1=190976&r2=190977&view=diff
==============================================================================
---
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/InteropConstants.java
(original)
+++
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/InteropConstants.java
Thu Jun 16 11:13:21 2005
@@ -71,17 +71,14 @@
*/
String WEATHER_STATION_1_EPR_URL =
System.getProperty(InteropConstants.SYSPROP_WS1_EPR_URL,
"http://localhost:8080/muse/epr/weather-station-1-epr.xml";);
String WEATHER_STATION_2_EPR_URL =
System.getProperty(InteropConstants.SYSPROP_WS2_EPR_URL,
"http://localhost:8080/muse/epr/weather-station-2-epr.xml";);
- //String WEATHER_STATION_CLIENT_CONFIG_EPR_URL =
System.getProperty(InteropConstants.SYSPROP_WS_CLIENT_CONFIG_EPR_URL,
"http://localhost:8080/muse/epr/weather-client-config-epr.xml";);;
-
- /**
- * Client Config Service URL
- */
- //String WEATHER_STATION_DIR_SERVICE_URL =
System.getProperty(InteropConstants.SYSPROP_WS_DIR_SERVICE_URL,
"http://localhost:8080/muse/services/WeatherStationDir";);
/**
* BASE SERVICE ADDRESS *
*/
String BASE_ADDRESS = System.getProperty(SYSPROP_BASE_ADDRESS,
"http://localhost:8080/muse/services";);
-
+ /**
+ * Interval for changing operational status back to available
+ */
+ int OPERATIONAL_STATUS_RESET_INTERVAL =
Integer.parseInt(System.getProperty("OPERATIONAL_STATUS_RESET_INTERVAL","20000"));
}
Modified:
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/InteropRequestUtils.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/InteropRequestUtils.java?rev=190977&r1=190976&r2=190977&view=diff
==============================================================================
---
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/InteropRequestUtils.java
(original)
+++
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/InteropRequestUtils.java
Thu Jun 16 11:13:21 2005
@@ -123,6 +123,7 @@
XmlBeanUtils.addChildElement(requestEnvelope.getBody(), requestDoc);
try
{
+ System.out.println("Sending request to: " + address);
URL endpointURL = new URL(address);
URI actionURI = new URI(action);
String response = SoapClient.sendRequest(endpointURL,
requestEnvelopeDoc.newInputStream(), actionURI);
@@ -163,11 +164,13 @@
public static EndpointReferenceDocument getEndpointReference(URL url)
throws Exception
{
+ System.out.println("Connecting to URL for EPR: " + url.toString());
return (EndpointReferenceDocument) XmlObject.Factory.parse(url);
}
public static String getResourceId(EndpointReferenceType
endpointReferenceType)
{
+ System.out.println("Getting resourceid for epr: " +
endpointReferenceType.getAddress().getStringValue());
GetResourcePropertyDocument getResourcePropertyDocument =
GetResourcePropertyDocument.Factory.newInstance();
getResourcePropertyDocument.setGetResourceProperty(IdentityCapability.PROP_NAME_RESOURCE_ID);
XmlObject xmlObject = sendRequest(getResourcePropertyDocument,
"http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl/GetResourceProperty";,
new XmlBeansEndpointReference(endpointReferenceType));
Modified:
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherClientConfig/WeatherClientConfigHome.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherClientConfig/WeatherClientConfigHome.java?rev=190977&r1=190976&r2=190977&view=diff
==============================================================================
---
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherClientConfig/WeatherClientConfigHome.java
(original)
+++
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherClientConfig/WeatherClientConfigHome.java
Thu Jun 16 11:13:21 2005
@@ -52,6 +52,7 @@
public static final String HOME_LOCATION =
org.apache.ws.resource.JndiConstants.CONTEXT_NAME_SERVICES + "/" +
SERVICE_NAME.getLocalPart() + "/" +
org.apache.ws.resource.JndiConstants.ATOMIC_NAME_HOME;
+ private static Object m_lock = new Object();
/**
* @param resourceContext
* @return A Resource
@@ -68,7 +69,10 @@
Resource resource = null;
try
{
- resource = find(key); //attempt to find from the underlying cache
+ synchronized (m_lock)
+ {
+ resource = find(key); //attempt to find from the underlying
cache
+ }
}
catch (ResourceException re)
{
Modified:
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherClientConfig/WeatherClientConfigResource.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherClientConfig/WeatherClientConfigResource.java?rev=190977&r1=190976&r2=190977&view=diff
==============================================================================
---
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherClientConfig/WeatherClientConfigResource.java
(original)
+++
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherClientConfig/WeatherClientConfigResource.java
Thu Jun 16 11:13:21 2005
@@ -168,6 +168,7 @@
}
catch (Exception e)
{
+ e.printStackTrace();
throw new FaultException(Soap1_1Constants.FAULT_SERVER, "Unable to
init the ResourceProperty Changed topics. Cause: " + e.getLocalizedMessage());
}
Modified:
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/OpStatusChanger.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/OpStatusChanger.java?rev=190977&r1=190976&r2=190977&view=diff
==============================================================================
---
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/OpStatusChanger.java
(original)
+++
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/OpStatusChanger.java
Thu Jun 16 11:13:21 2005
@@ -1,6 +1,7 @@
package org.wsdmdemo.service.weatherStation;
import
org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart2.OperationalStatusDocument;
+import org.wsdmdemo.service.InteropConstants;
/**
@@ -31,7 +32,7 @@
{
try
{
- Thread.sleep(60000);
+ Thread.sleep(InteropConstants.OPERATIONAL_STATUS_RESET_INTERVAL);
}
catch (InterruptedException e)
{
Modified:
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/WeatherStationHome.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/WeatherStationHome.java?rev=190977&r1=190976&r2=190977&view=diff
==============================================================================
---
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/WeatherStationHome.java
(original)
+++
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/WeatherStationHome.java
Thu Jun 16 11:13:21 2005
@@ -58,6 +58,7 @@
public static final String HOME_LOCATION =
org.apache.ws.resource.JndiConstants.CONTEXT_NAME_SERVICES + "/" +
SERVICE_NAME.getLocalPart() + "/" +
org.apache.ws.resource.JndiConstants.ATOMIC_NAME_HOME;
+ private static Object m_lock = new Object();
public WeatherStationHome()
{
@@ -123,7 +124,10 @@
Resource resource = null;
try
{
- resource = find(key); //attempt to find from the underlying cache
+ synchronized (m_lock)
+ {
+ resource = find(key); //attempt to find from the underlying
cache
+ }
}
catch (ResourceException re)
{
Modified:
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/WeatherStationResource.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/WeatherStationResource.java?rev=190977&r1=190976&r2=190977&view=diff
==============================================================================
---
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/WeatherStationResource.java
(original)
+++
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/WeatherStationResource.java
Thu Jun 16 11:13:21 2005
@@ -135,7 +135,7 @@
// init the {http://wsdmdemo.org/service/weather-station}Name
Resource Property
resourceProperty =
resourcePropertySet.get(WeatherStationPropertyQNames.NAME);
org.wsdmdemo.service.weatherStation.NameDocument prop_name =
org.wsdmdemo.service.weatherStation.NameDocument.Factory.newInstance();
- prop_name.setName(InteropConstants.WS2_KEY);
+ prop_name.setName("NASA");
resourceProperty.add(prop_name);
Modified:
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/WeatherStationService.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/WeatherStationService.java?rev=190977&r1=190976&r2=190977&view=diff
==============================================================================
---
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/WeatherStationService.java
(original)
+++
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/WeatherStationService.java
Thu Jun 16 11:13:21 2005
@@ -57,8 +57,7 @@
org.wsdmdemo.service.weatherStation.RecalibrateResponseDocument.RecalibrateResponse
response = responseDocument.addNewRecalibrateResponse();
//set status to unavailable
changeOperationalStatus(OperationalStatusDocument.OperationalStatus.UNAVAILABLE);
- //todo spawn thread with timer to reset the op status to avail
-
+
Thread thread = new Thread(new OpStatusChanger(this));
thread.start();
Modified:
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStationDir/WeatherStationDirResource.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStationDir/WeatherStationDirResource.java?rev=190977&r1=190976&r2=190977&view=diff
==============================================================================
---
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStationDir/WeatherStationDirResource.java
(original)
+++
incubator/muse/trunk/src/ieeedemo/src/java/org/wsdmdemo/service/weatherStationDir/WeatherStationDirResource.java
Thu Jun 16 11:13:21 2005
@@ -169,6 +169,7 @@
//add the new ws as the other participant
RelationshipParticipantType childRelationshipParticipantType =
relationshipType.addNewParticipant();
+ System.out.println("Getting the Resource ID for the EPR: " +
childEpr.getAddress().getStringValue());
String resourceId = InteropRequestUtils.getResourceId(childEpr);
if(resourceId == null)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
