Author: wire
Date: Thu Jun 23 12:09:24 2005
New Revision: 193201
URL: http://svn.apache.org/viewcvs?rev=193201&view=rev
Log:
Changes for Chicago GGF
Added:
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/common/SetupJDialog.java
Modified:
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/common/LocationJPanel.java
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/smgr/BlackBerryApp.java
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/smgr/NotificationListener.java
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/wcdisplay/WcDisplayApp.java
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/wcmgr/WcMgrApp.java
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/ws/muws/interop/client/ResourceStub.java
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WsImpl.java
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/MessagesJPanel.java
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/StatusJPanel.java
Modified:
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/common/LocationJPanel.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/common/LocationJPanel.java?rev=193201&r1=193200&r2=193201&view=diff
==============================================================================
---
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/common/LocationJPanel.java
(original)
+++
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/common/LocationJPanel.java
Thu Jun 23 12:09:24 2005
@@ -31,11 +31,15 @@
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
import org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceDocument;
+
+import java.awt.Container;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.GridBagConstraints;
import java.awt.event.ContainerAdapter;
import java.awt.event.ContainerEvent;
+import javax.swing.JButton;
+import javax.swing.border.SoftBevelBorder;
/**
* This code was generated using CloudGarden's Jigloo
* SWT/Swing GUI Builder, which is free for non-commercial
@@ -56,8 +60,14 @@
private JLabel jLabelLocation;
private JLabel jLabelAniStatus;
private ImageIcon stillIcon=new
ImageIcon(getClass().getClassLoader().getResource("org/apache/interop/wcdisplay/hp-still.gif"));
+ private JButton jButtonListenerConfig;
private ImageIcon aniIcon=new
ImageIcon(getClass().getClassLoader().getResource("org/apache/interop/wcdisplay/hp-ani.gif"));
private ConnectionListener listener;
+ private String appName="app";
+ private String listenerEndpointURL;
+ private int listenerPort;
+ private SetupJDialog setupDialog;
+ private Properties props;
/**
* Auto-generated main method to display this JFrame
@@ -73,6 +83,21 @@
//inst.setVisible(true);
}
+ public void setAppName(String appName){
+ this.appName=appName;
+ }
+
+ public LocationJPanel(String appName){
+ setAppName(appName);
+ initGUI();
+ try {
+ load();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
public LocationJPanel() {
super();
initGUI();
@@ -93,8 +118,8 @@
FlowLayout jPanel1Layout = new FlowLayout();
this.setBackground(new java.awt.Color(239,239,239));
GridBagLayout thisLayout = new GridBagLayout();
- thisLayout.columnWeights = new double[] {0.1,0.1,0.1,0.1};
- thisLayout.columnWidths = new int[] {7,7,7,7};
+ thisLayout.columnWeights = new double[] {0.1,0.1,0.1,0.1,0.1};
+ thisLayout.columnWidths = new int[] {7,7,7,7,7};
thisLayout.rowWeights = new double[] {0.1};
thisLayout.rowHeights = new int[] {7};
this.setLayout(thisLayout);
@@ -151,7 +176,7 @@
{
jLabelAniStatus = new JLabel();
this.add(jLabelAniStatus, new GridBagConstraints(
- 3,
+ 4,
0,
1,
1,
@@ -165,11 +190,47 @@
jLabelAniStatus.setIcon(new
ImageIcon(getClass().getClassLoader().getResource("org/apache/interop/wcdisplay/hp-still.gif")));
jLabelAniStatus.setBorder(BorderFactory.createBevelBorder(BevelBorder.LOWERED,
null, null, null, null));
}
+ {
+ jButtonListenerConfig = new JButton();
+ this.add(jButtonListenerConfig, new GridBagConstraints(
+ 3,
+ 0,
+ 1,
+ 1,
+ 0.0,
+ 0.1,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.NONE,
+ new Insets(0, 0, 0, 0),
+ 0,
+ 0));
+ jButtonListenerConfig.setText("Setup...");
+ jButtonListenerConfig.addActionListener(new
ActionListener() {
+ public void actionPerformed(ActionEvent evt) {
+ System.out
+
.println("jButtonListenerConfig.actionPerformed, event="
+ + evt);
+ onSetup();
+ }
+ });
+ }
}
/**
*
*/
+ protected void onSetup() {
+ Container parent1 = this.getParent();
+ while(!(parent1 instanceof JFrame)){
+ parent1 = parent1.getParent();
+ }
+ setupDialog=new SetupJDialog((JFrame)parent1,this);
+ setupDialog.show(true);
+ }
+
+ /**
+ *
+ */
protected void handleConnect() {
if(jToggleButtonGo.isSelected()){
jLabelAniStatus.setIcon(aniIcon);
@@ -206,26 +267,60 @@
return (EndpointReferenceDocument) XmlObject.Factory.parse(url);
}
public void load() throws IOException{
- Properties props = new Properties();
- File confFile=new File("interop.prefs");
+ props = new Properties();
+ File confFile=new File("interop.prefs");
if(!confFile.exists())
return;
FileInputStream is=new FileInputStream(confFile);
props.load(is);
//JFrame parent=(JFrame)getParent().getParent().getParent();
- String urlText=props.getProperty("app"+".URL");
+ String urlText=null;
+ urlText=props.getProperty(appName+".URL");
+
if(urlText!=null){
jTextFieldUrl.setText(urlText);
}
+
+ // Load listenerEndpointInfo
+ listenerEndpointURL=props.getProperty(appName+".listenerUrl");
+ if(listenerEndpointURL==null)
+ listenerEndpointURL="http://localhost:8001/endpoint";;
+ if(props.getProperty(appName+".listenPort")==null)
+ listenerPort=8001;
+ else
+
listenerPort=Integer.parseInt(props.getProperty(appName+".listenPort"));
+
+
+
}
public void save() throws IOException{
- Properties props = new Properties();
+ //Properties props = new Properties();
File confFile=new File("interop.prefs");
//JFrame parent=(JFrame)getParent().getParent().getParent().getParent();
String urlText=jTextFieldUrl.getText();
- props.setProperty("app.URL",urlText);
+ props.setProperty(appName+".URL",urlText);
+ props.setProperty(appName+".listenerUrl",listenerEndpointURL);
+ props.setProperty(appName+".listenPort",""+listenerPort);
+
+
FileOutputStream is=new FileOutputStream(confFile);
props.save(is,"Prefs for interop");
}
+
+ public String getListenerEndpointURL() {
+ return listenerEndpointURL;
+ }
+ public void setListenerEndpointURL(String listenerEndpointURL) {
+ this.listenerEndpointURL = listenerEndpointURL;
+ }
+ public int getListenerPort() {
+ return listenerPort;
+ }
+ public void setListenerPort(int listenerPort) {
+ this.listenerPort = listenerPort;
+ }
+ public void setSetupVisible(boolean state){
+ jButtonListenerConfig.setVisible(state);
+ }
}
Added:
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/common/SetupJDialog.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/common/SetupJDialog.java?rev=193201&view=auto
==============================================================================
---
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/common/SetupJDialog.java
(added)
+++
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/common/SetupJDialog.java
Thu Jun 23 12:09:24 2005
@@ -0,0 +1,214 @@
+package org.apache.interop.common;
+
+import javax.swing.JFrame;
+
+
+/**
+* This code was generated using CloudGarden's Jigloo
+* SWT/Swing GUI Builder, which is free for non-commercial
+* use. If Jigloo is being used commercially (ie, by a corporation,
+* company or business for any purpose whatever) then you
+* should purchase a license for each developer using Jigloo.
+* Please visit www.cloudgarden.com for details.
+* Use of Jigloo implies acceptance of these licensing terms.
+* *************************************
+* A COMMERCIAL LICENSE HAS NOT BEEN PURCHASED
+* for this machine, so Jigloo or this code cannot be used legally
+* for any corporate or commercial purpose.
+* *************************************
+*/
+import javax.swing.JPanel;
+import javax.swing.JButton;
+import java.awt.Insets;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import javax.swing.JTextField;
+import javax.swing.JLabel;
+import java.awt.FlowLayout;
+import java.awt.BorderLayout;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import java.io.IOException;
+public class SetupJDialog extends javax.swing.JDialog {
+ private JPanel jPanel1;
+ private JLabel jLabelNotificationEndpoint;
+ private JTextField jTextFieldLocalListenerPort;
+ private JTextField jTextFieldNotificationEndpoint;
+ private JLabel jLabelLocalPort;
+ private JPanel jPanelMain;
+ private JButton jButtonCancel;
+ private JButton jButtonOK;
+ private LocationJPanel lp;
+
+ /**
+ * Auto-generated main method to display this JDialog
+ */
+ public static void main(String[] args) {
+ JFrame frame = new JFrame();
+ SetupJDialog inst = new SetupJDialog(frame);
+ inst.setVisible(true);
+ }
+
+ public SetupJDialog(JFrame frame) {
+ super(frame);
+ initGUI();
+ }
+
+ public SetupJDialog(JFrame frame,LocationJPanel lp) {
+ super(frame);
+ initGUI();
+ this.lp=lp;
+
jTextFieldNotificationEndpoint.setText(lp.getListenerEndpointURL());
+
jTextFieldLocalListenerPort.setText(Integer.toString(lp.getListenerPort()));
+
+ }
+
+ private void initGUI() {
+ try {
+ this.setSize(400, 300);
+ this.setTitle("Setup...");
+ {
+ jPanel1 = new JPanel();
+ FlowLayout jPanel1Layout = new FlowLayout();
+ jPanel1Layout.setAlignment(FlowLayout.RIGHT);
+ this.getContentPane().add(jPanel1,
BorderLayout.SOUTH);
+ jPanel1.setLayout(jPanel1Layout);
+ {
+ jButtonOK = new JButton();
+ jPanel1.add(jButtonOK);
+ jButtonOK.setText("OK");
+ jButtonOK.addActionListener(new
ActionListener() {
+ public void
actionPerformed(ActionEvent evt) {
+ System.out
+
.println("jButtonOK.actionPerformed, event="
+ + evt);
+ doOk();
+ }
+ });
+ }
+ {
+ jButtonCancel = new JButton();
+ jPanel1.add(jButtonCancel);
+ jButtonCancel.setText("Cancel");
+ jButtonCancel.addActionListener(new
ActionListener() {
+ public void
actionPerformed(ActionEvent evt) {
+ System.out
+
.println("jButtonCancel.actionPerformed, event="
+ + evt);
+ doCancel();
+ }
+ });
+ }
+ }
+ {
+ jPanelMain = new JPanel();
+ GridBagLayout jPanel2Layout = new
GridBagLayout();
+ jPanel2Layout.columnWeights = new double[]
{0.1,0.1};
+ jPanel2Layout.columnWidths = new int[] {7,7};
+ jPanel2Layout.rowWeights = new double[]
{0.1,0.1};
+ jPanel2Layout.rowHeights = new int[] {7,7};
+ this.getContentPane().add(jPanelMain,
BorderLayout.CENTER);
+ jPanelMain.setLayout(jPanel2Layout);
+ {
+ jLabelNotificationEndpoint = new
JLabel();
+ jPanelMain.add(
+ jLabelNotificationEndpoint,
+ new GridBagConstraints(
+ 0,
+ 0,
+ 1,
+ 1,
+ 0.2,
+ 0.1,
+
GridBagConstraints.NORTHEAST,
+ GridBagConstraints.NONE,
+ new Insets(5, 0, 0, 5),
+ 0,
+ 0));
+
jLabelNotificationEndpoint.setText("Notification Endpoint:");
+
jLabelNotificationEndpoint.setBounds(11, 15, 124, 20);
+ }
+ {
+ jLabelLocalPort = new JLabel();
+ jPanelMain.add(jLabelLocalPort, new
GridBagConstraints(
+ 0,
+ 1,
+ 1,
+ 1,
+ 0.2,
+ 2.0,
+ GridBagConstraints.NORTHEAST,
+ GridBagConstraints.NONE,
+ new Insets(5, 0, 0, 5),
+ 0,
+ 0));
+ jLabelLocalPort.setText("Local Listener
Port:");
+ jLabelLocalPort.setBounds(12, 49, 138,
23);
+ }
+ {
+ jTextFieldNotificationEndpoint = new
JTextField();
+ jPanelMain.add(
+ jTextFieldNotificationEndpoint,
+ new GridBagConstraints(
+ 1,
+ 0,
+ 1,
+ 1,
+ 9.0,
+ 0.1,
+
GridBagConstraints.NORTHWEST,
+
GridBagConstraints.HORIZONTAL,
+ new Insets(5, 0, 0, 5),
+ 0,
+ 0));
+
jTextFieldNotificationEndpoint.setBounds(141, 10, 58, 30);
+ }
+ {
+ jTextFieldLocalListenerPort = new
JTextField();
+ jPanelMain.add(
+ jTextFieldLocalListenerPort,
+ new GridBagConstraints(
+ 1,
+ 1,
+ 1,
+ 1,
+ 0.8,
+ 0.1,
+
GridBagConstraints.NORTHWEST,
+
GridBagConstraints.HORIZONTAL,
+ new Insets(5, 0, 0, 5),
+ 0,
+ 0));
+
jTextFieldLocalListenerPort.setBounds(163, 52, 60, 30);
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ *
+ */
+ protected void doOk() {
+
lp.setListenerEndpointURL(jTextFieldNotificationEndpoint.getText());
+
lp.setListenerPort(Integer.parseInt(jTextFieldLocalListenerPort.getText()));
+ try {
+ lp.save();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ hide();
+
+ }
+
+ /**
+ *
+ */
+ protected void doCancel() {
+ this.hide();
+
+ }
+
+}
Modified:
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/smgr/BlackBerryApp.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/smgr/BlackBerryApp.java?rev=193201&r1=193200&r2=193201&view=diff
==============================================================================
---
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/smgr/BlackBerryApp.java
(original)
+++
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/smgr/BlackBerryApp.java
Thu Jun 23 12:09:24 2005
@@ -152,7 +152,7 @@
public void startListener() throws IOException{
m_messageWorker=new MessageWorker(this,m_buffer);
- m_listener=new NotificationListener(8002,600000,m_buffer);
+ m_listener=new NotificationListener(8000,600000,m_buffer);
m_listener.setCloseSocketAfterNotification(false);
m_messageWorker.start();
m_listener.start();
Modified:
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/smgr/NotificationListener.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/smgr/NotificationListener.java?rev=193201&r1=193200&r2=193201&view=diff
==============================================================================
---
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/smgr/NotificationListener.java
(original)
+++
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/smgr/NotificationListener.java
Thu Jun 23 12:09:24 2005
@@ -75,8 +75,9 @@
try
{
if(sock!=null)
-
+ synchronized(sock){
sock.notifyAll();
+ }
if(bufIn!=null)
bufIn.close();
if(bufOut!=null)
Modified:
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/wcdisplay/WcDisplayApp.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/wcdisplay/WcDisplayApp.java?rev=193201&r1=193200&r2=193201&view=diff
==============================================================================
---
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/wcdisplay/WcDisplayApp.java
(original)
+++
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/wcdisplay/WcDisplayApp.java
Thu Jun 23 12:09:24 2005
@@ -66,6 +66,9 @@
setTitle("WCDisplay ");
jPanelLocation.setConnectionListener(this);
temperatureJPanel1.setSmooth(true);
+ jPanelLocation.setAppName("WsDisplay");
+ jPanelLocation.setSetupVisible(false);
+
}
private void initGUI() {
@@ -162,8 +165,10 @@
// jLabelAniStatus.setIcon(stillIcon);
// }})
// ;
- m_connection.deleteObservers();
- m_connection=null;
+ if(m_connection!=null){
+ m_connection.deleteObservers();
+ m_connection=null;
+ }
if(m_timer!=null){
m_timer.stop();
m_timer=null; // Collect me
Modified:
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/wcmgr/WcMgrApp.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/wcmgr/WcMgrApp.java?rev=193201&r1=193200&r2=193201&view=diff
==============================================================================
---
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/wcmgr/WcMgrApp.java
(original)
+++
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/interop/wcmgr/WcMgrApp.java
Thu Jun 23 12:09:24 2005
@@ -47,6 +47,7 @@
import org.xmlsoap.schemas.soap.envelope.Body;
import org.xmlsoap.schemas.soap.envelope.EnvelopeDocument;
import org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceType;
+import org.xmlsoap.schemas.ws.x2004.x08.addressing.ReferencePropertiesType;
import org.apache.interop.common.LocationJPanel;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
@@ -79,8 +80,8 @@
private ResourceStub m_resource;
private static final QName RELATIONSHIP_QNAME=new
QName("http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part2.xsd","Relationship";);
private Vector model;
- private String
notificationListenerUrl="http://192.168.2.120:8001/bogas";;
- private static final int LISTENER_PORT = 8000;
+ private String notificationListenerUrl="http://localhost:8001/bogas";;
+ private int LISTENER_PORT = 8000;
private static final String WcConfigEprURL="";
private JButton jButton;
private JPanel jPanel1;
@@ -98,6 +99,7 @@
initGUI();
statusJPanel.setPopupListener(this);
locationJPanel.setConnectionListener(this);
+
//
locationJPanel.setResourceUrl("http://12.35.246.160:8080/muse/services/WeatherStationDir";);
// locationJPanel.setTopicNamespace("");
// locationJPanel.getTopicName("");
@@ -124,14 +126,15 @@
}
});
{
- locationJPanel = new LocationJPanel();
+ locationJPanel = new LocationJPanel("WsMgr");
+ locationJPanel.setAppName("WsMgr");
this.getContentPane().add(locationJPanel,
BorderLayout.NORTH);
}
{
jSplitPane = new JSplitPane();
this.getContentPane().add(jSplitPane,
BorderLayout.CENTER);
jSplitPane.setOrientation(JSplitPane.VERTICAL_SPLIT);
- jSplitPane.setDividerLocation(150);
+ jSplitPane.setDividerLocation(220);
{
statusJPanel = new StatusJPanel();
jSplitPane.add(statusJPanel,
JSplitPane.TOP);
@@ -144,6 +147,7 @@
{
jPanel1 = new JPanel();
this.getContentPane().add(jPanel1,
BorderLayout.SOUTH);
+ jPanel1.setVisible(false);
{
jButton = new JButton();
jPanel1.add(jButton);
@@ -218,6 +222,8 @@
*/
public void onConnect() {
+ notificationListenerUrl=locationJPanel.getListenerEndpointURL();
+ LISTENER_PORT=locationJPanel.getListenerPort();
// Start TCP Listener and A worker that will deliver received
notifications
m_messageWorker = new MessageWorker(this,m_buffer);
m_listener = new
NotificationListener(LISTENER_PORT,60000,m_buffer);
@@ -283,7 +289,7 @@
private Color colorFromStatus(String status) {
if(status.equalsIgnoreCase("Available"))
return Color.GREEN;
- if(status.equalsIgnoreCase("Unavailable"))
+ if(status.equalsIgnoreCase("Unavailable"))//Unavailable
return Color.RED;
return Color.GRAY;
@@ -332,9 +338,10 @@
* @see org.apache.interop.smgr.ConnectionListener#onDisconnect()
*/
public void onDisconnect() {
-
- m_messageWorker.stop();
- m_listener.stop();
+ if(m_messageWorker!=null)
+ m_messageWorker.stop();
+ if(m_listener!=null)
+ m_listener.stop();
}
@@ -387,6 +394,7 @@
if(!(ws instanceof IWc)){
EndpointReference eprTest = ws.getEpr();
+ // Is this an IBM Endpoint?
if(epr.getAddress().getStringValue().endsWith("anonymous")){
if(eprTest.getAddress().endsWith("WeatherStationSOAP")){
Color
color=colorFromStatus(optStatus);
@@ -395,8 +403,21 @@
}
else {
if(eprTest.getAddress().equals(epr.getAddress().getStringValue())){
- Color
color=colorFromStatus(optStatus);
-
statusJPanel.setColor(ws.getName(),color);
+ Object[] refProps =
eprTest.getReferenceProperties();
+ XmlObject xmlRefProp =
(XmlObject)epr.getReferenceProperties();
+
+
if(refProps!=null&&refProps.length>0){
+ XmlObject xmlOb =
(XmlObject)refProps[0];
+ String
resourceId=xmlOb.newCursor().getTextValue();
+ String
resIdOfEpr=xmlRefProp.newCursor().getTextValue();
+
if(resourceId.equals(resIdOfEpr)){
+ Color
color=colorFromStatus(optStatus);
+
statusJPanel.setColor(ws.getName(),color);
+ }
+ } else {
+ Color
color=colorFromStatus(optStatus);
+
statusJPanel.setColor(ws.getName(),color);
+ }
}
}
repairIfNeeded(ws.getName(),optStatus);
@@ -416,6 +437,8 @@
if(name.equals(activeWsName)){
System.out.println("Have decided to repair based on
ACTIVE ws being "+activeWsName+" and event name being "+name +"being
"+optStatus);
resolveWsProblem();
+ } else {
+ System.out.println("Not going to repair based on ACTIVE
ws being "+activeWsName+" and event name being "+name +"being "+optStatus);
}
}
@@ -440,25 +463,32 @@
/* (non-Javadoc)
* @see
org.apache.interop.wcmgr.CommandListener#recalibrate(java.lang.String)
*/
- public void recalibrate(String stationName) {
- System.out.println("I will recalibrate "+stationName);
- for (Iterator iter = model.iterator(); iter.hasNext();) {
- WsImpl station = (WsImpl) iter.next();
- if(station.getName().equals(stationName)){
- //ServiceStub sstub;
-
- ResourceStub sstub = new
ResourceStub(station.getEpr());
-
sstub.addObserver(messagesJPanel1);
- RecalibrateDocument recalibrateDocument
= RecalibrateDocument.Factory.newInstance();
- recalibrateDocument.addNewRecalibrate();
- sstub.sendRequest(recalibrateDocument,
-
"http://recalibrate","M";);
+ public void recalibrate(final String stationName) {
+
+ Runnable runnable=new Runnable(){
-
-
sstub.deleteObserver(messagesJPanel1);
+ public void run() {
+ System.out.println("I will recalibrate
"+stationName);
+ for (Iterator iter = model.iterator(); iter.hasNext();)
{
+ WsImpl station = (WsImpl) iter.next();
+
if(station.getName().equals(stationName)){
+ //ServiceStub sstub;
+
+ ResourceStub sstub = new
ResourceStub(station.getEpr());
+
sstub.addObserver(messagesJPanel1);
+ RecalibrateDocument
recalibrateDocument = RecalibrateDocument.Factory.newInstance();
+
recalibrateDocument.addNewRecalibrate();
+
sstub.sendRequest(recalibrateDocument,
+
"http://recalibrate","M";);
+
+
+
sstub.deleteObserver(messagesJPanel1);
+ }
}
- }
+
+ }};
+ new Thread(runnable).start();
}
/**
Modified:
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/ws/muws/interop/client/ResourceStub.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/client/src/org/apache/ws/muws/interop/client/ResourceStub.java?rev=193201&r1=193200&r2=193201&view=diff
==============================================================================
---
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/ws/muws/interop/client/ResourceStub.java
(original)
+++
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/ws/muws/interop/client/ResourceStub.java
Thu Jun 23 12:09:24 2005
@@ -121,13 +121,19 @@
public XmlObject sendRequest( XmlObject requestDoc, String action ,String
type )
{
- EnvelopeDocument requestEnvelopeDoc = createEnvelope();
+ // Hack for internal network
+ String addr=m_epr.getAddress();
+ addr=addr.replaceAll("192\\.168\\.0\\.20","12.35.246.160");
+
+ EnvelopeDocument requestEnvelopeDoc = createEnvelope();
Envelope requestEnvelope = requestEnvelopeDoc.getEnvelope();
addAddressingHeaders( requestEnvelope.getHeader(), action );
XmlBeanUtils.addChildElement( requestEnvelope.getBody(), requestDoc );
try
{
- URL endpointURL = new URL( m_epr.getAddress() );
+ // Hack for internal network
+
+ URL endpointURL = new URL( addr );//m_epr.getAddress()
URI actionURI = new URI( action );
if ( DEBUG ) { System.out.println( "Sending request: \n" +
requestEnvelopeDoc ); }
String response = SoapClient.sendRequest( endpointURL,
requestEnvelopeDoc.newInputStream(), actionURI );
Modified:
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WsImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WsImpl.java?rev=193201&r1=193200&r2=193201&view=diff
==============================================================================
---
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WsImpl.java
(original)
+++
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WsImpl.java
Thu Jun 23 12:09:24 2005
@@ -222,7 +222,17 @@
*
*/
public void makeActive(EndpointReference referenceToWcConfigEpr) {
- XmlObject newEpr =
((XmlBeansEndpointReference)wsEpr).getXmlObject(AddressingConstants.NSURI_ADDRESSING_SCHEMA);
+ XmlBeansEndpointReference eprRef =
(XmlBeansEndpointReference)referenceToWcConfigEpr;
+ //eprRef.set
+
+
+ EndpointReferenceType newEpr = (EndpointReferenceType)
((XmlBeansEndpointReference)wsEpr).getXmlObject(AddressingConstants.NSURI_ADDRESSING_SCHEMA);
+
+ // Hack for internal IP
+ AttributedURI attribURI = newEpr.getAddress();
+ String addr=attribURI.getStringValue();
+ //addr.replaceAll("12\\.35\\.246\\.160","192.168.0.20");
+
attribURI.setStringValue(addr.replaceAll("12\\.35\\.246\\.160","192.168.0.20"));
SetResourcePropertiesDocument setResourcePropertiesDocument =
SetResourcePropertiesDocument.Factory.newInstance();
SetResourcePropertiesDocument.SetResourceProperties
setResourceProperties =
setResourcePropertiesDocument.addNewSetResourceProperties();
UpdateType updateType = UpdateType.Factory.newInstance();
Modified:
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/MessagesJPanel.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/MessagesJPanel.java?rev=193201&r1=193200&r2=193201&view=diff
==============================================================================
---
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/MessagesJPanel.java
(original)
+++
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/MessagesJPanel.java
Thu Jun 23 12:09:24 2005
@@ -207,6 +207,7 @@
BorderLayout.CENTER);
jScrollPaneRequest
.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+
jScrollPaneRequest.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
{
jPanelRequest =
new JPanel();
BorderLayout
jPanelRequestLayout = new BorderLayout();
@@ -223,7 +224,6 @@
.setPreferredSize(new java.awt.Dimension(
200,
257));
-
request.setEditable(false);
request
.setMinimumSize(new java.awt.Dimension(
50,
@@ -247,6 +247,7 @@
jPanelRight.add(jScrollPaneResponse, BorderLayout.CENTER);
jScrollPaneResponse
.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+
jScrollPaneResponse.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
{
jPanelResponse
= new JPanel();
jScrollPaneResponse.setViewportView(jPanelResponse);
@@ -261,7 +262,6 @@
.setPreferredSize(new java.awt.Dimension(
200,
257));
-
response.setEditable(false);
response
.setMinimumSize(new java.awt.Dimension(
5,
@@ -286,9 +286,22 @@
request.setText("");
return;
}
+ response.setText("");
+ request.setText("");
+
WcmMessage value=(WcmMessage) jListTime.getSelectedValue();
response.setText(value.getResponse());
- request.setText(value.getRequest());
+ response.getCaret().setDot(response.getText().length() );
+
jScrollPaneResponse.scrollRectToVisible(jScrollPaneResponse.getVisibleRect() );
+ jScrollPaneResponse.invalidate();
+
+ request.setText(value.getRequest());
+ request.getCaret().setDot(request.getText().length() );
+
jScrollPaneRequest.scrollRectToVisible(jScrollPaneRequest.getVisibleRect() );
+ jScrollPaneRequest.invalidate();
+
+ this.paint(this.getGraphics());
+
}
public JEditorPane getRequest() {
Modified:
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/StatusJPanel.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/StatusJPanel.java?rev=193201&r1=193200&r2=193201&view=diff
==============================================================================
---
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/StatusJPanel.java
(original)
+++
incubator/muse/trunk/src/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/StatusJPanel.java
Thu Jun 23 12:09:24 2005
@@ -240,7 +240,7 @@
// Remaining WSs
for(int index=1;index<wsArry.length;index++){
- cells[index] = createVertex(wsArry[index].getName(),
20+100*(index-1), 140, 50, 50,
+ cells[index] = createVertex(wsArry[index].getName(),
20+200*(index-1), 140, 150, 50,
Color.GRAY, true,0);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
