Menu
▾
▴
magicmap-commits — SVN commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(14) |
Mar
|
Apr
(4) |
May
(57) |
Jun
(14) |
Jul
(15) |
Aug
(5) |
Sep
(29) |
Oct
(13) |
Nov
(44) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(14) |
Feb
(78) |
Mar
(55) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(12) |
Dec
(9) |
| 2007 |
Jan
(21) |
Feb
(67) |
Mar
(39) |
Apr
(28) |
May
(7) |
Jun
|
Jul
(6) |
Aug
(2) |
Sep
(1) |
Oct
(18) |
Nov
(8) |
Dec
(11) |
| 2008 |
Jan
(16) |
Feb
(12) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Florian L. <fle...@us...> - 2005-06-08 11:43:46
|
Update of /cvsroot/magicmap/magicmapclient In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6908 Modified Files: start.sh Log Message: updated CLASSPATH Index: start.sh =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/start.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** start.sh 7 Jun 2005 12:35:50 -0000 1.2 --- start.sh 8 Jun 2005 11:43:38 -0000 1.3 *************** *** 1,4 **** #!/bin/sh ! export CLASSPATH="dist\magicmap.jar;lib/activation.jar:lib/axis.jar:lib/colt.jar:lib/forms-1.0.5.jar:lib/looks-1.2.2.jar:lib/mail.jar:lib/magicmapclient.jar:lib/RelativeLayout.jar:lib/xml-apis.jar:lib/commons-collections-3.1.jar:lib/concurrent.jar:lib/looks-1.2.2.jar:lib/xercesImpl.jar:lib/xmlParserAPIs.jar:lib/wsdl4j.jar:lib/saaj.jar:lib/jaxrpc.jar:lib/commons-logging.jar:lib/commons-discovery.jar:lib/axis.jar:lib/log4j-1.2.8.jar:lib/jung-1.5.2.jar:" java net.sf.magicmap.client.gui.MainGUI --- 1,4 ---- #!/bin/sh ! export CLASSPATH="dist/magicmap.jar:lib/activation.jar:lib/axis.jar:lib/colt.jar:lib/forms-1.0.5.jar:lib/looks-1.2.2.jar:lib/mail.jar:lib/magicmapclient.jar:lib/RelativeLayout.jar:lib/xml-apis.jar:lib/commons-collections-3.1.jar:lib/concurrent.jar:lib/looks-1.2.2.jar:lib/xercesImpl.jar:lib/xmlParserAPIs.jar:lib/wsdl4j.jar:lib/saaj.jar:lib/jaxrpc.jar:lib/commons-logging.jar:lib/commons-discovery.jar:lib/axis.jar:lib/log4j-1.2.8.jar:lib/jung-1.5.2.jar:" java net.sf.magicmap.client.gui.MainGUI |
|
From: Florian L. <fle...@us...> - 2005-06-07 12:36:02
|
Update of /cvsroot/magicmap/magicmapclient In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7497 Modified Files: start.sh Log Message: updated CLASSPATH Index: start.sh =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/start.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** start.sh 6 Feb 2005 19:30:38 -0000 1.1 --- start.sh 7 Jun 2005 12:35:50 -0000 1.2 *************** *** 1,4 **** #!/bin/sh ! export CLASSPATH="lib/activation.jar:lib/axis.jar:lib/colt.jar:lib/forms-1.0.5.jar:lib/looks-1.2.2.jar:lib/mail.jar:lib/magicmapclient.jar:lib/RelativeLayout.jar:lib/xml-apis.jar:lib/commons-collections-3.1.jar:lib/concurrent.jar:lib/looks-1.2.2.jar:lib/xercesImpl.jar:lib/xmlParserAPIs.jar:lib/wsdl4j.jar:lib/saaj.jar:lib/jaxrpc.jar:lib/commons-logging.jar:lib/commons-discovery.jar:lib/axis.jar:lib/log4j-1.2.8.jar:lib/jung-1.5.2.jar:" java net.sf.magicmap.client.gui.MainGUI --- 1,4 ---- #!/bin/sh ! export CLASSPATH="dist\magicmap.jar;lib/activation.jar:lib/axis.jar:lib/colt.jar:lib/forms-1.0.5.jar:lib/looks-1.2.2.jar:lib/mail.jar:lib/magicmapclient.jar:lib/RelativeLayout.jar:lib/xml-apis.jar:lib/commons-collections-3.1.jar:lib/concurrent.jar:lib/looks-1.2.2.jar:lib/xercesImpl.jar:lib/xmlParserAPIs.jar:lib/wsdl4j.jar:lib/saaj.jar:lib/jaxrpc.jar:lib/commons-logging.jar:lib/commons-discovery.jar:lib/axis.jar:lib/log4j-1.2.8.jar:lib/jung-1.5.2.jar:" java net.sf.magicmap.client.gui.MainGUI |
|
From: Florian L. <fle...@us...> - 2005-06-02 00:13:24
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20780/src/net/sf/magicmap/client/controller Modified Files: PollHandler.java Log Message: - fixed not-showing-right-Measurement-bug in MapView - fixed update tree in OutlineView - implemented alphabetical-orderd-input-method for OutlineView - fixed remove-all-nodes-method in OutlineView when loading a new map - implemented scrollpane for OutlineView Index: PollHandler.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PollHandler.java 11 May 2005 10:51:27 -0000 1.3 --- PollHandler.java 2 Jun 2005 00:13:12 -0000 1.4 *************** *** 110,121 **** location.setId(position.getId().longValue()); nodeModel.addNode(location); if (position.getPosX().intValue() != -1 && position.getPosY().intValue() != -1){ ! location.setPosition(position.getPosX().intValue(), position.getPosY().intValue()); ! location.setFix(true); ! } else{ ! location.setFix(false); ! } ! location.setName(position.getName()); // Signalcharakteristik auswerden und gesehene // AccessPoints ebenfalls erzeugen bzw. mit ihnen Verbindungen --- 110,121 ---- location.setId(position.getId().longValue()); + location.setName(position.getName()); nodeModel.addNode(location); if (position.getPosX().intValue() != -1 && position.getPosY().intValue() != -1){ ! location.setPosition(position.getPosX().intValue(), position.getPosY().intValue()); ! location.setFix(true); ! } else{ ! location.setFix(false); ! } // Signalcharakteristik auswerden und gesehene // AccessPoints ebenfalls erzeugen bzw. mit ihnen Verbindungen *************** *** 205,209 **** } ap.setId(position.getId().longValue()); ! ; // Nur Position von fixierten AccessPoints beachten if (position.isFixed()){ --- 205,209 ---- } ap.setId(position.getId().longValue()); ! // Nur Position von fixierten AccessPoints beachten if (position.isFixed()){ *************** *** 240,246 **** + ". Füge zum Graphen hinzu."); client = new ClientNode(nodeModel); - nodeModel.addNode(client); - client.setName(clientdto.getName()); client.setMacAddress(clientdto.getMac()); } --- 240,246 ---- + ". Füge zum Graphen hinzu."); client = new ClientNode(nodeModel); client.setMacAddress(clientdto.getMac()); + client.setName(clientdto.getName()); + nodeModel.addNode(client); } |
|
From: Florian L. <fle...@us...> - 2005-06-02 00:13:24
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20780/src/net/sf/magicmap/client/views Modified Files: MapView.java OutlineView.java Log Message: - fixed not-showing-right-Measurement-bug in MapView - fixed update tree in OutlineView - implemented alphabetical-orderd-input-method for OutlineView - fixed remove-all-nodes-method in OutlineView when loading a new map - implemented scrollpane for OutlineView Index: OutlineView.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/OutlineView.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OutlineView.java 16 Jan 2005 16:01:32 -0000 1.1 --- OutlineView.java 2 Jun 2005 00:13:12 -0000 1.2 *************** *** 13,16 **** --- 13,17 ---- import javax.swing.JLabel; import javax.swing.JPanel; + import javax.swing.JScrollPane; import javax.swing.JTree; import javax.swing.border.EmptyBorder; *************** *** 46,51 **** super(); this.setFrameIcon(GUIBuilder.getToolIcon(GUIConstants.ICON_OUTLINE)); - this.model = null; - this.tree = null; } --- 47,50 ---- *************** *** 57,67 **** } - public void expandAll(JTree tree){ - int row = 0; - while (row < tree.getRowCount()){ - tree.expandRow(row); - row++; - } - } /* (non-Javadoc) --- 56,59 ---- *************** *** 71,96 **** RelativeLayout layout = new RelativeLayout(); RelativePanelBuilder builder = new RelativePanelBuilder(layout); ! ! this.treeroot = new OutlineNode("ROOT"); ! this.treemodel = new DefaultTreeModel(treeroot); nodeAccessPoints = new OutlineNode(GUIUtils.i18n("accesspoints")); nodeClients = new OutlineNode(GUIUtils.i18n("clients")); nodeLocations = new OutlineNode(GUIUtils.i18n("locations")); ! this.treeroot.add(nodeAccessPoints); ! this.treeroot.add(nodeClients); ! this.treeroot.add(nodeLocations); tree = new JTree(treemodel); tree.setRootVisible(false); tree.setCellRenderer(new OutlineRenderer()); tree.setBorder(new EmptyBorder(new Insets(3, 3, 3, 3))); ! builder.add(tree, "tree"); builder.setTopTopDistance("tree", null, 0); builder.setBottomBottomDistance("tree", null, 0); builder.setLeftLeftDistance("tree", null, 0); builder.setRightRightDistance("tree", null, 0); ! JPanel panel = builder.getPanel(); panel.setMinimumSize(new Dimension(200, -1)); ! panel.setMaximumSize(new Dimension(-1, -1)); return panel; } --- 63,96 ---- RelativeLayout layout = new RelativeLayout(); RelativePanelBuilder builder = new RelativePanelBuilder(layout); ! ! treeroot = new OutlineNode("ROOT"); ! treemodel = new DefaultTreeModel(treeroot); ! nodeAccessPoints = new OutlineNode(GUIUtils.i18n("accesspoints")); nodeClients = new OutlineNode(GUIUtils.i18n("clients")); nodeLocations = new OutlineNode(GUIUtils.i18n("locations")); ! ! treeroot.add(nodeAccessPoints); ! treeroot.add(nodeClients); ! treeroot.add(nodeLocations); ! tree = new JTree(treemodel); tree.setRootVisible(false); tree.setCellRenderer(new OutlineRenderer()); tree.setBorder(new EmptyBorder(new Insets(3, 3, 3, 3))); ! ! JComponent pane = new JScrollPane(tree,JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); ! pane.setBorder(new EmptyBorder(new Insets(0, 0, 0, 0))); ! ! builder.add(pane, "tree"); builder.setTopTopDistance("tree", null, 0); builder.setBottomBottomDistance("tree", null, 0); builder.setLeftLeftDistance("tree", null, 0); builder.setRightRightDistance("tree", null, 0); ! JPanel panel = builder.getPanel(); panel.setMinimumSize(new Dimension(200, -1)); ! panel.setMaximumSize(new Dimension(-1,-1)); ! return panel; } *************** *** 196,216 **** */ public void nodeAddedEvent(Node node){ switch (node.getType()) { case NodeModel.NODETYPE_ACCESSPOINT : ! nodeAccessPoints.add(new OutlineNode(node)); ! //treemodel.nodeChanged(nodeAccessPoints); break; ! case NodeModel.NODETYPE_CLIENT : ! nodeClients.add(new OutlineNode(node)); ! //treemodel.nodeChanged(nodeClients); break; case NodeModel.NODETYPE_LOCATION : ! nodeLocations.add(new OutlineNode(node)); ! //treemodel.nodeChanged(nodeLocations); break; } ! if (tree != null){ ! expandAll(tree); ! } } --- 196,218 ---- */ public void nodeAddedEvent(Node node){ + OutlineNode on = new OutlineNode(node); + int index = 0; switch (node.getType()) { case NodeModel.NODETYPE_ACCESSPOINT : ! index = getAlphabeticalIndex(nodeAccessPoints,on); ! treemodel.insertNodeInto(on,nodeAccessPoints,index); break; ! case NodeModel.NODETYPE_CLIENT : ! index = getAlphabeticalIndex(nodeClients,on); ! treemodel.insertNodeInto(on,nodeClients,index); break; case NodeModel.NODETYPE_LOCATION : ! index = getAlphabeticalIndex(nodeLocations,on); ! treemodel.insertNodeInto(on,nodeLocations,index); break; } ! for (int i=0; i<tree.getRowCount();i++) ! if(tree.isShowing()&& tree.isCollapsed(i)) ! tree.expandRow(i); } *************** *** 230,233 **** --- 232,236 ---- this.nodeClients.removeAllChildren(); this.nodeLocations.removeAllChildren(); + treemodel.reload(); } } *************** *** 243,246 **** --- 246,257 ---- } + + private int getAlphabeticalIndex(OutlineNode parent,OutlineNode node){ + int index=0; + while((parent.getChildCount() > index) && (((OutlineNode)(node)).getNode().getDisplayName().compareToIgnoreCase(((OutlineNode)(parent.getChildAt(index))).getNode().getDisplayName()) > 0)){ + ++index; + } + return index; + } } \ No newline at end of file Index: MapView.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/MapView.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MapView.java 31 May 2005 12:48:38 -0000 1.6 --- MapView.java 2 Jun 2005 00:13:12 -0000 1.7 *************** *** 1071,1074 **** --- 1071,1076 ---- if (v == null){ Controller.getInstance().setMeasurementViewLocal(true); + Controller.getInstance().getMeasurementView().setTitle( + GUIUtils.i18n("measurement") + " " + Controller.getInstance().getClient().getDisplayName()); return; } *************** *** 1078,1081 **** --- 1080,1085 ---- Controller.getInstance().setMeasurementViewLocal(false); Controller.getInstance().buildOtherMeasurement((AccessPointSeerNode) node); + } else { + Controller.getInstance().setMeasurementViewLocal(true); } Controller.getInstance().getMeasurementView().setTitle( *************** *** 1084,1087 **** --- 1088,1093 ---- } else{ Controller.getInstance().setMeasurementViewLocal(true); + Controller.getInstance().getMeasurementView().setTitle( + GUIUtils.i18n("measurement") + " " + Controller.getInstance().getClient().getDisplayName()); } |
|
From: Florian L. <fle...@us...> - 2005-06-02 00:13:22
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/model/node In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20780/src/net/sf/magicmap/client/model/node Modified Files: Node.java Log Message: - fixed not-showing-right-Measurement-bug in MapView - fixed update tree in OutlineView - implemented alphabetical-orderd-input-method for OutlineView - fixed remove-all-nodes-method in OutlineView when loading a new map - implemented scrollpane for OutlineView Index: Node.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/model/node/Node.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Node.java 16 Jan 2005 16:01:26 -0000 1.1 --- Node.java 2 Jun 2005 00:13:12 -0000 1.2 *************** *** 63,67 **** String oldname = this.name; this.name = name; ! model.rehashNode(this, oldname); } --- 63,68 ---- String oldname = this.name; this.name = name; ! if (model.nodeExists(oldname)) ! model.rehashNode(this, oldname); } |
|
From: Andreas W. <an...@us...> - 2005-05-31 12:50:06
|
Update of /cvsroot/magicmap/magicmapclient In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2223 Modified Files: start.bat Log Message: resolved missing jar-file-bug in start.bat Index: start.bat =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/start.bat,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** start.bat 13 Feb 2005 14:49:19 -0000 1.2 --- start.bat 31 May 2005 12:49:58 -0000 1.3 *************** *** 1,3 **** ! java -cp "lib\activation.jar;lib\axis.jar;lib\colt.jar;lib\forms-1.0.5.jar;lib\looks-1.2.2.jar;lib\mail.jar;lib\magicmapclient.jar;lib\RelativeLayout.jar;lib\xml-apis.jar;lib\commons-collections-3.1.jar;lib\concurrent.jar;lib\looks-1.2.2.jar;lib\xercesImpl.jar;lib\xmlParserAPIs.jar;lib\wsdl4j.jar;lib\saaj.jar;lib\jaxrpc.jar;lib\commons-logging.jar;lib\commons-discovery.jar;lib\axis.jar;lib\log4j-1.2.8.jar;lib\jung-1.5.2.jar" net.sf.magicmap.client.gui.MainGUI --- 1,3 ---- ! java -cp "dist\magicmap.jar;lib\activation.jar;lib\axis.jar;lib\colt.jar;lib\forms-1.0.5.jar;lib\looks-1.2.2.jar;lib\mail.jar;lib\magicmapclient.jar;lib\RelativeLayout.jar;lib\xml-apis.jar;lib\commons-collections-3.1.jar;lib\concurrent.jar;lib\looks-1.2.2.jar;lib\xercesImpl.jar;lib\xmlParserAPIs.jar;lib\wsdl4j.jar;lib\saaj.jar;lib\jaxrpc.jar;lib\commons-logging.jar;lib\commons-discovery.jar;lib\axis.jar;lib\log4j-1.2.8.jar;lib\jung-1.5.2.jar" net.sf.magicmap.client.gui.MainGUI |
|
From: Andreas W. <an...@us...> - 2005-05-31 12:48:47
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1521/src/net/sf/magicmap/client/views Modified Files: MapView.java Log Message: fixed bug in <measurement for> Index: MapView.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/MapView.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MapView.java 11 May 2005 10:51:29 -0000 1.5 --- MapView.java 31 May 2005 12:48:38 -0000 1.6 *************** *** 1080,1084 **** } Controller.getInstance().getMeasurementView().setTitle( ! GUIUtils.i18n("measurementfor") + " " + node.getDisplayName()); } else{ --- 1080,1084 ---- } Controller.getInstance().getMeasurementView().setTitle( ! GUIUtils.i18n("measurement") + " " + node.getDisplayName()); } else{ |
|
From: Martin S. <sch...@us...> - 2005-05-11 16:13:49
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19727/src/net/sf/magicmap/client/utils Modified Files: Version.java Log Message: Index: Version.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils/Version.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Version.java 11 May 2005 15:45:02 -0000 1.10 --- Version.java 11 May 2005 16:13:37 -0000 1.11 *************** *** 14,19 **** public static final String PROTOCOL_VERSION = net.sf.magicmap.server.utils.Version.PROTOCOL_VERSION; public static final int VERSION_MAJOR = 0; ! public static final int VERSION_MINOR = 6; ! public static final String VERSION_FLAVOR = " stable"; public static String getVersion(){ --- 14,19 ---- public static final String PROTOCOL_VERSION = net.sf.magicmap.server.utils.Version.PROTOCOL_VERSION; public static final int VERSION_MAJOR = 0; ! public static final int VERSION_MINOR = 7; ! public static final String VERSION_FLAVOR = " unstable"; public static String getVersion(){ |
|
From: Martin S. <sch...@us...> - 2005-05-11 15:47:58
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/server/exception In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14758/src/net/sf/magicmap/server/exception Removed Files: AuthenticationException.java SessionException.java MapException.java Log Message: --- MapException.java DELETED --- --- SessionException.java DELETED --- --- AuthenticationException.java DELETED --- |
Update of /cvsroot/magicmap/magicmapclient/src/localhost/magicmap/services/SessionFacade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14758/src/localhost/magicmap/services/SessionFacade Removed Files: SessionFacadeSoapBindingStub.java SessionFacadeServiceLocator.java SessionFacadeService.java SessionFacade.java Log Message: --- SessionFacade.java DELETED --- --- SessionFacadeService.java DELETED --- --- SessionFacadeServiceLocator.java DELETED --- --- SessionFacadeSoapBindingStub.java DELETED --- |
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/server/dto In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14758/src/net/sf/magicmap/server/dto Removed Files: PositionDTO.java AccessPointDTO.java SimpleScanResultDTO.java ClientDTO.java SignalCharacterDTO.java MapDTO.java Log Message: --- ClientDTO.java DELETED --- --- PositionDTO.java DELETED --- --- AccessPointDTO.java DELETED --- --- SimpleScanResultDTO.java DELETED --- --- MapDTO.java DELETED --- --- SignalCharacterDTO.java DELETED --- |
Update of /cvsroot/magicmap/magicmapclient/src/localhost/magicmap/services/PositionFacade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14758/src/localhost/magicmap/services/PositionFacade Removed Files: PositionFacade.java PositionFacadeSoapBindingStub.java PositionFacadeService.java PositionFacadeServiceLocator.java Log Message: --- PositionFacade.java DELETED --- --- PositionFacadeSoapBindingStub.java DELETED --- --- PositionFacadeService.java DELETED --- --- PositionFacadeServiceLocator.java DELETED --- |
|
From: Martin S. <sch...@us...> - 2005-05-11 15:47:57
|
Update of /cvsroot/magicmap/magicmapclient/src/localhost/magicmap/services/MapFacade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14758/src/localhost/magicmap/services/MapFacade Removed Files: MapFacadeServiceLocator.java MapFacade.java MapFacadeSoapBindingStub.java MapFacadeService.java Log Message: --- MapFacadeService.java DELETED --- --- MapFacade.java DELETED --- --- MapFacadeSoapBindingStub.java DELETED --- --- MapFacadeServiceLocator.java DELETED --- |
|
From: Martin S. <sch...@us...> - 2005-05-11 15:47:11
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14454/src/net/sf/magicmap/server/utils Modified Files: Version.java Log Message: + wsdl2java via ant-task + string[] replaced +axis 1.2 (final) Index: Version.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/utils/Version.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Version.java 13 Feb 2005 21:34:43 -0000 1.4 --- Version.java 11 May 2005 15:46:27 -0000 1.5 *************** *** 15,18 **** public interface Version { ! public static final String PROTOCOL_VERSION = "0.3"; } \ No newline at end of file --- 15,18 ---- public interface Version { ! public static final String PROTOCOL_VERSION = "0.4"; } \ No newline at end of file |
|
From: Martin S. <sch...@us...> - 2005-05-11 15:46:42
|
Update of /cvsroot/magicmap/magicmapserver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14454 Modified Files: .project Log Message: + wsdl2java via ant-task + string[] replaced +axis 1.2 (final) Index: .project =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/.project,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .project 14 Feb 2005 15:14:13 -0000 1.2 --- .project 11 May 2005 15:46:30 -0000 1.3 *************** *** 1,5 **** <?xml version="1.0" encoding="UTF-8"?> <projectDescription> ! <name>MagicMapServer</name> <comment></comment> <projects> --- 1,5 ---- <?xml version="1.0" encoding="UTF-8"?> <projectDescription> ! <name>magicmapserver</name> <comment></comment> <projects> |
|
From: Martin S. <sch...@us...> - 2005-05-11 15:46:42
|
Update of /cvsroot/magicmap/magicmapserver/web/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14454/web/WEB-INF Modified Files: server-config.wsdd log4j.properties deploy.wsdd Log Message: + wsdl2java via ant-task + string[] replaced +axis 1.2 (final) Index: deploy.wsdd =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/web/WEB-INF/deploy.wsdd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** deploy.wsdd 12 Feb 2005 15:19:26 -0000 1.1 --- deploy.wsdd 11 May 2005 15:46:30 -0000 1.2 *************** *** 3,6 **** --- 3,7 ---- <parameter name="className" value="net.sf.magicmap.server.facade.MapFacade"/> <parameter name="allowedMethods" value="*"/> + <beanMapping qname="myNS:StringReplacementDTO" xmlns:myNS="urn:dto.server.magicmap.sf.net" languageSpecificType="java:net.sf.magicmap.server.dto.StringReplacementDTO"/> <beanMapping qname="myNS:MapDTO" xmlns:myNS="urn:dto.server.magicmap.sf.net" languageSpecificType="java:net.sf.magicmap.server.dto.MapDTO"/> </service> Index: server-config.wsdd =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/web/WEB-INF/server-config.wsdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** server-config.wsdd 16 Feb 2005 08:58:27 -0000 1.2 --- server-config.wsdd 11 May 2005 15:46:30 -0000 1.3 *************** *** 2,13 **** <deployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:java="http://xml.apache.org/axis/wsdd/providers/java"> <globalConfiguration> <parameter name="adminPassword" value="admin"/> <parameter name="attachments.Directory" value="d:\projekte\magicmapserver\web\WEB-INF\attachments"/> ! <parameter name="disablePrettyXML" value="true"/> ! <parameter name="sendMultiRefs" value="true"/> <parameter name="sendXsiTypes" value="true"/> <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/> - <parameter name="sendXMLDeclaration" value="true"/> - <parameter name="axis.sendMinimizedElements" value="true"/> <requestFlow> <handler type="java:org.apache.axis.handlers.JWSHandler"> --- 2,14 ---- <deployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:java="http://xml.apache.org/axis/wsdd/providers/java"> <globalConfiguration> + <parameter name="sendMultiRefs" value="true"/> + <parameter name="disablePrettyXML" value="true"/> <parameter name="adminPassword" value="admin"/> <parameter name="attachments.Directory" value="d:\projekte\magicmapserver\web\WEB-INF\attachments"/> ! <parameter name="axis.sendMinimizedElements" value="true"/> ! <parameter name="enableNamespacePrefixOptimization" value="true"/> ! <parameter name="sendXMLDeclaration" value="true"/> <parameter name="sendXsiTypes" value="true"/> <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/> <requestFlow> <handler type="java:org.apache.axis.handlers.JWSHandler"> *************** *** 23,30 **** <handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/> <handler name="Authenticate" type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/> - <service name="SessionFacade" provider="java:RPC"> - <parameter name="allowedMethods" value="*"/> - <parameter name="className" value="net.sf.magicmap.server.facade.SessionFacade"/> - </service> <service name="AdminService" provider="java:MSG"> <parameter name="allowedMethods" value="AdminService"/> --- 24,27 ---- *************** *** 33,36 **** --- 30,37 ---- <namespace>http://xml.apache.org/axis/wsdd/</namespace> </service> + <service name="SessionFacade" provider="java:RPC"> + <parameter name="allowedMethods" value="*"/> + <parameter name="className" value="net.sf.magicmap.server.facade.SessionFacade"/> + </service> <service name="Version" provider="java:RPC"> <parameter name="allowedMethods" value="getVersion"/> *************** *** 40,54 **** <parameter name="allowedMethods" value="*"/> <parameter name="className" value="net.sf.magicmap.server.facade.MapFacade"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.MapDTO" qname="ns1:MapDTO" xmlns:ns1="urn:dto.server.magicmap.sf.net"/> </service> <service name="PositionFacade" provider="java:RPC"> <parameter name="allowedMethods" value="*"/> <parameter name="className" value="net.sf.magicmap.server.facade.PositionFacade"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.SignalCharacterDTO" qname="ns2:SignalCharacterDTO" xmlns:ns2="urn:dto.server.magicmap.sf.net"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.SimpleScanResultDTO" qname="ns3:SimpleScanResultDTO" xmlns:ns3="urn:dto.server.magicmap.sf.net"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.PositionDTO" qname="ns4:PositionDTO" xmlns:ns4="urn:dto.server.magicmap.sf.net"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.SignalCharacterDTO" qname="ns5:SignalCharacterDTO" xmlns:ns5="urn:dto.server.magicmap.sf.net"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.AccessPointDTO" qname="ns6:AccessPointDTO" xmlns:ns6="urn:dto.server.magicmap.sf.net"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.ClientDTO" qname="ns7:ClientDTO" xmlns:ns7="urn:dto.server.magicmap.sf.net"/> </service> <transport name="http"> --- 41,56 ---- <parameter name="allowedMethods" value="*"/> <parameter name="className" value="net.sf.magicmap.server.facade.MapFacade"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.StringReplacementDTO" qname="ns1:StringReplacementDTO" xmlns:ns1="urn:dto.server.magicmap.sf.net"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.MapDTO" qname="ns2:MapDTO" xmlns:ns2="urn:dto.server.magicmap.sf.net"/> </service> <service name="PositionFacade" provider="java:RPC"> <parameter name="allowedMethods" value="*"/> <parameter name="className" value="net.sf.magicmap.server.facade.PositionFacade"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.SignalCharacterDTO" qname="ns3:SignalCharacterDTO" xmlns:ns3="urn:dto.server.magicmap.sf.net"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.SimpleScanResultDTO" qname="ns4:SimpleScanResultDTO" xmlns:ns4="urn:dto.server.magicmap.sf.net"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.PositionDTO" qname="ns5:PositionDTO" xmlns:ns5="urn:dto.server.magicmap.sf.net"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.SignalCharacterDTO" qname="ns6:SignalCharacterDTO" xmlns:ns6="urn:dto.server.magicmap.sf.net"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.AccessPointDTO" qname="ns7:AccessPointDTO" xmlns:ns7="urn:dto.server.magicmap.sf.net"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.ClientDTO" qname="ns8:ClientDTO" xmlns:ns8="urn:dto.server.magicmap.sf.net"/> </service> <transport name="http"> Index: log4j.properties =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/web/WEB-INF/log4j.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** log4j.properties 14 Jan 2005 16:08:47 -0000 1.1 --- log4j.properties 11 May 2005 15:46:30 -0000 1.2 *************** *** 1,10 **** # Set root category priority to INFO and its only appender to CONSOLE. ! #log4j.rootCategory=INFO, CONSOLE ! #log4j.rootCategory=INFO, CONSOLE, LOGFILE # Set the enterprise logger category to FATAL and its only appender to CONSOLE. ! log4j.logger.org.apache.axis=FATAL, MAGICFILE, CONSOLE ! log4j.logger.com.saugstation.server=DEBUG, MAGICFILE # CONSOLE is set to be a ConsoleAppender using a PatternLayout. --- 1,10 ---- # Set root category priority to INFO and its only appender to CONSOLE. ! log4j.rootCategory=INFO, CONSOLE ! log4j.rootCategory=INFO, CONSOLE, MAGICFILE # Set the enterprise logger category to FATAL and its only appender to CONSOLE. ! #log4j.logger.org.apache.axis=FATAL, MAGICFILE, CONSOLE ! #log4j.logger.com.saugstation.server=DEBUG, MAGICFILE # CONSOLE is set to be a ConsoleAppender using a PatternLayout. |
|
From: Martin S. <sch...@us...> - 2005-05-11 15:46:41
|
Update of /cvsroot/magicmap/magicmapserver/web/WEB-INF/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14454/web/WEB-INF/lib Modified Files: commons-logging.jar wsdl4j.jar commons-discovery.jar axis.jar axis-ant.jar jaxrpc.jar saaj.jar Log Message: + wsdl2java via ant-task + string[] replaced +axis 1.2 (final) Index: commons-logging.jar =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/web/WEB-INF/lib/commons-logging.jar,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsHj5GE3 and /tmp/cvsfVrJVJ differ Index: commons-discovery.jar =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/web/WEB-INF/lib/commons-discovery.jar,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsZfylv6 and /tmp/cvstaYnOM differ Index: axis.jar =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/web/WEB-INF/lib/axis.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsKzy6c7 and /tmp/cvsIho9IN differ Index: saaj.jar =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/web/WEB-INF/lib/saaj.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsVdlOAy and /tmp/cvsG6qYbf differ Index: jaxrpc.jar =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/web/WEB-INF/lib/jaxrpc.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsKx5BEA and /tmp/cvsB9fbhh differ Index: wsdl4j.jar =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/web/WEB-INF/lib/wsdl4j.jar,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvslHO2tA and /tmp/cvsylhz8g differ Index: axis-ant.jar =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/web/WEB-INF/lib/axis-ant.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsqaVUkG and /tmp/cvs94780m differ |
|
From: Martin S. <sch...@us...> - 2005-05-11 15:46:40
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14454/src/net/sf/magicmap/server/facade Modified Files: MapFacade.java Log Message: + wsdl2java via ant-task + string[] replaced +axis 1.2 (final) Index: MapFacade.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade/MapFacade.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MapFacade.java 11 May 2005 10:45:05 -0000 1.4 --- MapFacade.java 11 May 2005 15:46:30 -0000 1.5 *************** *** 14,17 **** --- 14,18 ---- import net.sf.magicmap.db.Map; import net.sf.magicmap.db.Session; + import net.sf.magicmap.server.dto.StringReplacementDTO; import net.sf.magicmap.server.dto.MapDTO; import net.sf.magicmap.server.exception.MapException; *************** *** 40,46 **** * @see net.sf.magicmap.server.facade.interfaces.MapFacadeInterface#getMapNames() */ ! public String[] getMapNames(){ ArrayList result = new ArrayList(); - PersistenceManager pm = null; Transaction tx = null; --- 41,46 ---- * @see net.sf.magicmap.server.facade.interfaces.MapFacadeInterface#getMapNames() */ ! public StringReplacementDTO[] getMapNames(){ ArrayList result = new ArrayList(); PersistenceManager pm = null; Transaction tx = null; *************** *** 56,60 **** while (it.hasNext()){ Map map = (Map) it.next(); ! result.add(map.getName()); } } --- 56,62 ---- while (it.hasNext()){ Map map = (Map) it.next(); ! StringReplacementDTO dto = new StringReplacementDTO(); ! dto.setWrappedString(map.getName()); ! result.add(dto); } } *************** *** 63,67 **** JDOUtil.closePM(pm); } ! return (String[]) result.toArray(new String[0]); } --- 65,69 ---- JDOUtil.closePM(pm); } ! return (StringReplacementDTO[]) result.toArray(new StringReplacementDTO[0]); } |
|
From: Martin S. <sch...@us...> - 2005-05-11 15:46:40
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14454/src/net/sf/magicmap/server/dto Added Files: StringReplacementDTO.java Log Message: + wsdl2java via ant-task + string[] replaced +axis 1.2 (final) --- NEW FILE: StringReplacementDTO.java --- package net.sf.magicmap.server.dto; /** * author schweige * date 03.12.2004 * copyright (C) 2004 Martin Schweigert, Tobias Hübner * * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * * Diese Klasse existiert nur, weil die .Net Soap-Implementierung keine String-Arrays, * wohl aber Arrays von anderen Typen behandeln kann... * */ public class StringReplacementDTO { protected String wrappedString; public StringReplacementDTO() { } /** * @return Returns the wrappedString. */ public String getWrappedString(){ return this.wrappedString; } /** * @param wrappedString The wrappedString to set. */ public void setWrappedString(String wrappedString){ this.wrappedString = wrappedString; } } |
|
From: Martin S. <sch...@us...> - 2005-05-11 15:46:38
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/interfaces In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14454/src/net/sf/magicmap/server/interfaces Modified Files: MapFacadeInterface.java Log Message: + wsdl2java via ant-task + string[] replaced +axis 1.2 (final) Index: MapFacadeInterface.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/interfaces/MapFacadeInterface.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MapFacadeInterface.java 12 Feb 2005 15:19:27 -0000 1.1 --- MapFacadeInterface.java 11 May 2005 15:46:30 -0000 1.2 *************** *** 4,7 **** --- 4,8 ---- import java.rmi.RemoteException; + import net.sf.magicmap.server.dto.StringReplacementDTO; import net.sf.magicmap.server.dto.MapDTO; import net.sf.magicmap.server.exception.MapException; *************** *** 26,30 **** * @return Array von Namen von Karten */ ! public abstract String[] getMapNames() throws RemoteException; /** --- 27,31 ---- * @return Array von Namen von Karten */ ! public abstract StringReplacementDTO[] getMapNames() throws RemoteException; /** |
|
From: Martin S. <sch...@us...> - 2005-05-11 15:45:19
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14302/src/net/sf/magicmap/client/controller Modified Files: VirtualServerManager.java Log Message: + wsdl2java via ant-task + string[] replaced +axis 1.2 (final) Index: VirtualServerManager.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** VirtualServerManager.java 11 May 2005 10:51:27 -0000 1.1 --- VirtualServerManager.java 11 May 2005 15:45:01 -0000 1.2 *************** *** 6,9 **** --- 6,11 ---- package net.sf.magicmap.client.controller; + import java.util.ArrayList; + import net.sf.magicmap.client.interfaces.CreateNewMapCallback; import net.sf.magicmap.client.interfaces.CreatePositionCallback; *************** *** 23,26 **** --- 25,29 ---- import net.sf.magicmap.server.dto.PositionDTO; import net.sf.magicmap.server.dto.SignalCharacterDTO; + import net.sf.magicmap.server.dto.StringReplacementDTO; import net.sf.magicmap.server.facade.MapFacade; import net.sf.magicmap.server.facade.PositionFacade; *************** *** 151,155 **** synchronized (mutex){ try{ ! String[] names = mapFacade.getMapNames(); callback.mapNamesReceived(names); } catch (Exception e){ --- 154,167 ---- synchronized (mutex){ try{ ! ! ArrayList result = new ArrayList(); ! StringReplacementDTO[] wrappedStrings = mapFacade.getMapNames(); ! if (wrappedStrings != null){ ! for (int i = 0; i < wrappedStrings.length; i++){ ! result.add(wrappedStrings[i].getWrappedString()); ! } ! } ! String[] names = (String[]) result.toArray(new String[0]); ! callback.mapNamesReceived(names); } catch (Exception e){ *************** *** 369,373 **** */ public void positionCreatedOrUpdatedOrDeleted(String mapName, long timeStamp, PositionDTO position){ ! // TODO Auto-generated method stub } --- 381,385 ---- */ public void positionCreatedOrUpdatedOrDeleted(String mapName, long timeStamp, PositionDTO position){ ! // TODO Auto-generated method stub } *************** *** 413,417 **** */ public void reloadMap(){ ! // TODO Auto-generated method stub } --- 425,429 ---- */ public void reloadMap(){ ! // TODO Auto-generated method stub } *************** *** 421,425 **** */ public void closeMap(){ ! // TODO Auto-generated method stub } --- 433,437 ---- */ public void closeMap(){ ! // TODO Auto-generated method stub } |
|
From: Martin S. <sch...@us...> - 2005-05-11 15:45:17
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14302/src/net/sf/magicmap/client/utils Modified Files: Version.java Log Message: + wsdl2java via ant-task + string[] replaced +axis 1.2 (final) Index: Version.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils/Version.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Version.java 11 May 2005 11:51:22 -0000 1.9 --- Version.java 11 May 2005 15:45:02 -0000 1.10 *************** *** 12,19 **** public abstract class Version { ! public static final String PROTOCOL_VERSION = "0.3"; public static final int VERSION_MAJOR = 0; public static final int VERSION_MINOR = 6; ! public static final String VERSION_FLAVOR = " unstable"; public static String getVersion(){ --- 12,19 ---- public abstract class Version { ! public static final String PROTOCOL_VERSION = net.sf.magicmap.server.utils.Version.PROTOCOL_VERSION; public static final int VERSION_MAJOR = 0; public static final int VERSION_MINOR = 6; ! public static final String VERSION_FLAVOR = " stable"; public static String getVersion(){ |
|
From: Martin S. <sch...@us...> - 2005-05-11 15:45:16
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate/exception In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14302/src/net/sf/magicmap/client/delegate/exception Modified Files: ExceptionHandler.java Log Message: + wsdl2java via ant-task + string[] replaced +axis 1.2 (final) Index: ExceptionHandler.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate/exception/ExceptionHandler.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ExceptionHandler.java 12 Feb 2005 16:00:17 -0000 1.2 --- ExceptionHandler.java 11 May 2005 15:45:02 -0000 1.3 *************** *** 39,50 **** if (faultString.indexOf(AUTHENTIFICATION_EXCEPTION) == 0){ String message = getMessage(faultString, AUTHENTIFICATION_EXCEPTION); ! result = new AuthenticationException(message); } else if (faultString.indexOf(MAP_EXCEPTION) == 0){ String message = getMessage(faultString, MAP_EXCEPTION); ! result = new MapException(message); } else if (faultString.indexOf(SESSION_EXCEPTION) == 0){ String message = getMessage(faultString, SESSION_EXCEPTION); ! result = new SessionException(message); } } return result; --- 39,57 ---- if (faultString.indexOf(AUTHENTIFICATION_EXCEPTION) == 0){ String message = getMessage(faultString, AUTHENTIFICATION_EXCEPTION); ! System.out.println(message); ! result = new AuthenticationException(); ! result.initCause(e); } else if (faultString.indexOf(MAP_EXCEPTION) == 0){ String message = getMessage(faultString, MAP_EXCEPTION); ! System.out.println(message); ! result = new MapException(); ! result.initCause(e); } else if (faultString.indexOf(SESSION_EXCEPTION) == 0){ String message = getMessage(faultString, SESSION_EXCEPTION); ! System.out.println(message); ! result = new SessionException(); ! result.initCause(e); } + } return result; |
|
From: Martin S. <sch...@us...> - 2005-05-11 15:45:16
|
Update of /cvsroot/magicmap/magicmapclient In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14302 Modified Files: .cvsignore build.xml .classpath Log Message: + wsdl2java via ant-task + string[] replaced +axis 1.2 (final) Index: .cvsignore =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .cvsignore 11 May 2005 10:53:35 -0000 1.2 --- .cvsignore 11 May 2005 15:45:02 -0000 1.3 *************** *** 3,4 **** --- 3,5 ---- magicmap derby.log + src-gen Index: .classpath =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/.classpath,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .classpath 11 May 2005 10:53:35 -0000 1.3 --- .classpath 11 May 2005 15:45:03 -0000 1.4 *************** *** 2,5 **** --- 2,6 ---- <classpath> <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="res"/> <classpathentry sourcepath="/magicmapserver/src" kind="lib" path="/magicmapserver/dist/magicmap-server.jar"/> Index: build.xml =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/build.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** build.xml 11 May 2005 10:53:35 -0000 1.4 --- build.xml 11 May 2005 15:45:03 -0000 1.5 *************** *** 9,12 **** --- 9,13 ---- <property name="dist" value="dist"/> <property name="src" value="src"/> + <property name="src.gen" value="src-gen"/> <property name="res" value="res"/> *************** *** 24,31 **** --- 25,44 ---- </path> + <path id="axis.classpath"> + <fileset dir="lib"> + <include name="**/*.jar" /> + </fileset> + <fileset dir="lib-dev"> + <include name="**/*.jar" /> + </fileset> + </path> + + <taskdef resource="axis-tasks.properties" + classpathref="axis.classpath" /> <target name="prepare" depends="clean"> <mkdir dir="${build}" /> <mkdir dir="${dist}" /> + <mkdir dir="${src.gen}" /> </target> *************** *** 33,39 **** <delete dir="${build}" /> <delete dir="${dist}" /> </target> ! <target name="compile" depends="prepare"> <javac destdir="${build}" debug="true" --- 46,77 ---- <delete dir="${build}" /> <delete dir="${dist}" /> + <delete dir="${src.gen}" /> </target> + + <target name="axis" depends="prepare"> + <axis-wsdl2java + output="${src.gen}" + testcase="false" + verbose="false" + noimports="true" + debug="false" + url="inf/PositionFacade.wsdl" /> + <axis-wsdl2java + output="${src.gen}" + testcase="false" + verbose="false" + noimports="true" + debug="false" + url="inf/SessionFacade.wsdl" /> + <axis-wsdl2java + output="${src.gen}" + testcase="false" + verbose="false" + noimports="true" + debug="false" + url="inf/MapFacade.wsdl" /> + </target> ! <target name="compile" depends="axis"> <javac destdir="${build}" debug="true" *************** *** 44,47 **** --- 82,86 ---- <classpath refid="build.classpath"/> <src path="${src}"/> + <src path="${src.gen}"/> </javac> </target> |
|
From: Martin S. <sch...@us...> - 2005-05-11 15:45:16
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14302/src/net/sf/magicmap/client/delegate Modified Files: MapDelegate.java Log Message: + wsdl2java via ant-task + string[] replaced +axis 1.2 (final) Index: MapDelegate.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate/MapDelegate.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MapDelegate.java 11 May 2005 10:51:28 -0000 1.3 --- MapDelegate.java 11 May 2005 15:45:02 -0000 1.4 *************** *** 8,11 **** --- 8,12 ---- import java.net.URL; import java.rmi.RemoteException; + import java.util.ArrayList; import localhost.magicmap.services.MapFacade.MapFacade; *************** *** 16,19 **** --- 17,21 ---- import net.sf.magicmap.client.utils.Settings; import net.sf.magicmap.server.dto.MapDTO; + import net.sf.magicmap.server.dto.StringReplacementDTO; import net.sf.magicmap.server.exception.MapException; import net.sf.magicmap.server.exception.SessionException; *************** *** 63,67 **** public String[] getMapNames() throws RemoteException{ try{ ! return this.binding.getMapNames(); } catch (Exception e){ throw ExceptionHandler.checkException(e); --- 65,77 ---- public String[] getMapNames() throws RemoteException{ try{ ! ! ArrayList result = new ArrayList(); ! StringReplacementDTO[] wrappedStrings = this.binding.getMapNames(); ! if (wrappedStrings != null){ ! for (int i = 0; i < wrappedStrings.length; i++){ ! result.add(wrappedStrings[i].getWrappedString()); ! } ! } ! return (String[]) result.toArray(new String[0]); } catch (Exception e){ throw ExceptionHandler.checkException(e); |
1 message has been excluded from this view by a project administrator.
