You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2011/12/19 16:37:28 UTC
svn commit: r1220801 [2/2] - in /incubator/openmeetings/trunk/singlewebapp:
./ src/docgenerator/org/openmeetings/doc/
src/dtdgenerator/org/openlaszlo/generator/elements/
src/dtdgenerator/org/openlaszlo/schema/ src/screenviewer/
src/screenviewer/de/medi...
Modified: incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/cache/ServerSharingSessionList.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/cache/ServerSharingSessionList.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/cache/ServerSharingSessionList.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/cache/ServerSharingSessionList.java Mon Dec 19 15:37:27 2011
@@ -1,29 +1,21 @@
package org.openmeetings.server.cache;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.LinkedHashMap;
import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
-import java.util.zip.GZIPInputStream;
-//import org.slf4j.Logger;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.openmeetings.server.beans.ServerFrameBean;
import org.openmeetings.server.beans.ServerFrameCursorStatus;
import org.openmeetings.server.beans.ServerSharingSessionBean;
-import org.openmeetings.server.beans.ServerSharingViewerBean;
import org.openmeetings.server.beans.ServerStatusBean;
import org.openmeetings.server.socket.ServerSocketMinaProcess;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+//import org.slf4j.Logger;
/**
* @author sebastianwagner
@@ -354,70 +346,6 @@ public class ServerSharingSessionList {
return null;
}
-
- /**
- * @param serverSharingSessionBean
- */
- private static void writeImagesToStandardDirectory(
- ServerSharingSessionBean serverSharingSessionBean) {
- try {
-
- String webappDir = ScopeApplicationAdapter.webAppPath;
-
- String baseDir = webappDir + File.separatorChar + "upload" + File.separatorChar + "screens" + File.separatorChar;
-
- File f = new File(baseDir);
- if (!f.exists() || !f.canWrite()) {
- throw new Exception("Directory is Not writeable or does not exist "+baseDir);
- }
-
- String sessionDIR = baseDir + serverSharingSessionBean.getPublicSID() + File.separatorChar;
-
- f = new File(sessionDIR);
- if (!f.exists()) {
- f.mkdir();
- }
-
- int i=1;
- for (ServerFrameBean serverFrameBean : serverSharingSessionBean.getServerFrameBeans()) {
-
-
- String gzipPath = sessionDIR + "pic_"+i+".gzip";
-
- FileOutputStream fos_1 = new FileOutputStream(gzipPath);
- fos_1.write(serverFrameBean.getImageBytes());
- fos_1.close();
-
-
- ByteArrayInputStream byteGzipIn = new ByteArrayInputStream(serverFrameBean.getImageBytes());
- GZIPInputStream gZipIn = new GZIPInputStream(byteGzipIn);
-
- ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
-
- byte[] buffer = new byte[1024];
- int count = 0;
- while ((count = gZipIn.read(buffer)) > 0 ){
- bytesOut.write(buffer,0,count);
- }
- bytesOut.close();
- gZipIn.close();
-
- log.debug("gZipIn CLosed");
-
- String imagePath = sessionDIR + "pic_"+i+".jpg";
-
- FileOutputStream fos = new FileOutputStream(imagePath);
- fos.write(bytesOut.toByteArray());
- fos.close();
-
- i++;
- }
-
- } catch (Exception err) {
- log.error("[writeImagesToStandardDirectory]",err);
- }
- }
-
public static synchronized ServerSharingSessionBean getServerSharingSessionBeanByPublicSID(String publicSID) {
try {
Modified: incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/codec/ServerDesktopRequestEncoder.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/codec/ServerDesktopRequestEncoder.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/codec/ServerDesktopRequestEncoder.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/codec/ServerDesktopRequestEncoder.java Mon Dec 19 15:37:27 2011
@@ -2,8 +2,6 @@ package org.openmeetings.server.codec;
import java.nio.ByteBuffer;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoder;
@@ -12,8 +10,8 @@ import org.openmeetings.app.remote.red5.
import org.openmeetings.server.beans.ServerFrameBean;
import org.openmeetings.server.beans.ServerFrameCursorStatus;
import org.openmeetings.server.beans.ServerStatusBean;
-
-import java.util.zip.*;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
/**
Modified: incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/rtmp/ScreenClient.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/rtmp/ScreenClient.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/rtmp/ScreenClient.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/rtmp/ScreenClient.java Mon Dec 19 15:37:27 2011
@@ -5,15 +5,6 @@ package org.openmeetings.server.rtmp;
import java.io.IOException;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-import org.red5.io.IStreamableFile;
-import org.red5.io.ITag;
-import org.red5.io.ITagWriter;
-import org.red5.io.ITagReader;
-import org.red5.io.flv.impl.FLVService;
-import org.red5.io.flv.impl.FLV;
-import org.red5.io.flv.impl.FLVReader;
-import org.red5.io.flv.impl.Tag;
-import org.red5.io.IoConstants;
import org.red5.io.utils.ObjectMap;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.event.IEvent;
@@ -21,10 +12,10 @@ import org.red5.server.api.event.IEventD
import org.red5.server.api.service.IPendingServiceCall;
import org.red5.server.api.service.IPendingServiceCallback;
import org.red5.server.net.rtmp.Channel;
-import org.red5.server.net.rtmp.RTMPClient;
+import org.red5.server.net.rtmp.ClientExceptionHandler;
import org.red5.server.net.rtmp.INetStreamEventHandler;
+import org.red5.server.net.rtmp.RTMPClient;
import org.red5.server.net.rtmp.RTMPConnection;
-import org.red5.server.net.rtmp.ClientExceptionHandler;
import org.red5.server.net.rtmp.codec.RTMP;
import org.red5.server.net.rtmp.event.AudioData;
import org.red5.server.net.rtmp.event.IRTMPEvent;
@@ -32,11 +23,8 @@ import org.red5.server.net.rtmp.event.No
import org.red5.server.net.rtmp.event.VideoData;
import org.red5.server.net.rtmp.message.Header;
import org.red5.server.net.rtmp.status.StatusCodes;
-import org.red5.server.net.rtmp.event.SerializeUtils;
import org.red5.server.stream.AbstractClientStream;
import org.red5.server.stream.IStreamData;
-import org.red5.server.stream.message.RTMPMessage;
-
import org.slf4j.Logger;
/**
@@ -63,18 +51,6 @@ public class ScreenClient extends RTMPCl
private RTMPConnection conn;
- private ITagWriter writer;
-
- private ITagReader reader;
-
- private int videoTs = 0;
-
- private int audioTs = 0;
-
- private int kt = 0;
-
- private int kt2 = 0;
-
//private ByteBuffer buffer;
@@ -107,7 +83,8 @@ public class ScreenClient extends RTMPCl
super.onInvoke( conn, channel, header, notify, rtmp );
try {
- ObjectMap< String, String > map = (ObjectMap) notify.getCall().getArguments()[ 0 ];
+ @SuppressWarnings("unchecked")
+ ObjectMap< String, String > map = (ObjectMap<String, String>) notify.getCall().getArguments()[ 0 ];
String code = map.get( "code" );
if ( StatusCodes.NS_PLAY_STOP.equals( code ) ) {
@@ -138,11 +115,6 @@ public class ScreenClient extends RTMPCl
createdPlayStream = false;
startPublish = false;
- videoTs = 0;
- audioTs = 0;
- kt = 0;
- kt2 = 0;
-
try {
connect( host, port, app, this );
@@ -188,8 +160,9 @@ public class ScreenClient extends RTMPCl
logger.debug( "onStreamEvent " + notify );
- ObjectMap map = (ObjectMap) notify.getCall().getArguments()[ 0 ];
- String code = (String) map.get( "code" );
+ @SuppressWarnings("unchecked")
+ ObjectMap< String, String > map = (ObjectMap< String, String >) notify.getCall().getArguments()[ 0 ];
+ String code = map.get( "code" );
if ( StatusCodes.NS_PUBLISH_START.equals( code ) ) {
logger.debug( "onStreamEvent Publish start" );
Modified: incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/servlets/ServerOutputHandler.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/servlets/ServerOutputHandler.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/servlets/ServerOutputHandler.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/servlets/ServerOutputHandler.java Mon Dec 19 15:37:27 2011
@@ -1,13 +1,8 @@
package org.openmeetings.server.servlets;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.PrintWriter;
import java.util.Date;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -16,9 +11,7 @@ import javax.servlet.http.HttpServletRes
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.openmeetings.server.beans.ServerFrameBean;
-import org.openmeetings.server.beans.ServerSharingSessionBean;
import org.openmeetings.server.cache.ServerSharingSessionList;
-import org.openmeetings.servlet.outputhandler.ScreenServlet;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/socket/ServerPacketMinaHandler.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/socket/ServerPacketMinaHandler.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/socket/ServerPacketMinaHandler.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/socket/ServerPacketMinaHandler.java Mon Dec 19 15:37:27 2011
@@ -6,7 +6,6 @@ import org.apache.mina.core.buffer.IoBuf
import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession;
-import org.apache.mina.transport.socket.SocketSessionConfig;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.openmeetings.server.beans.ServerFrameBean;
import org.openmeetings.server.beans.ServerFrameCursorStatus;
@@ -36,7 +35,7 @@ public class ServerPacketMinaHandler ext
cause.printStackTrace();
- session.close();
+ session.close(true);
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/util/DePacketizerUtil.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/util/DePacketizerUtil.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/util/DePacketizerUtil.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/util/DePacketizerUtil.java Mon Dec 19 15:37:27 2011
@@ -1,15 +1,9 @@
package org.openmeetings.server.util;
-import java.io.FileOutputStream;
-import java.nio.ByteBuffer;
-import java.util.Date;
-
-//import org.slf4j.Logger;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.openmeetings.server.beans.ServerFrameBean;
-
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
/**
* @author sebastianwagner
*
@@ -24,96 +18,9 @@ public class DePacketizerUtil {
log.debug("LENGTH incomingBytes "+incomingBytes.length);
throw new Exception("This Class is deprecated use the Protocol Codec Filter");
-
-// byte[] dst_mode = this.extractByte(incomingBytes,0,4);
-// Integer mode = this.convertByteArrayToInt(dst_mode);
-// log.debug("mode "+mode);
-//
-// byte[] dst = this.extractByte(incomingBytes,4,4);
-// Integer sequenceNumber = this.convertByteArrayToInt(dst);
-// log.debug("sequenceNumber "+sequenceNumber);
-//
-// byte[] dst_lengthSecurityToken = this.extractByte(incomingBytes,8,4);
-// Integer lengthSecurityToken = this.convertByteArrayToInt(dst_lengthSecurityToken);
-// log.debug("lengthSecurityToken "+lengthSecurityToken);
-//
-// byte[] dst_xValue = this.extractByte(incomingBytes,12,4);
-// Integer xValue = this.convertByteArrayToInt(dst_xValue);
-// log.debug("xValue "+xValue);
-//
-// byte[] dst_yValue = this.extractByte(incomingBytes,16,4);
-// Integer yValue = this.convertByteArrayToInt(dst_yValue);
-// log.debug("yValue "+yValue);
-//
-// byte[] dst_width = this.extractByte(incomingBytes,20,4);
-// Integer width = this.convertByteArrayToInt(dst_width);
-// log.debug("width "+width);
-//
-// byte[] dst_height = this.extractByte(incomingBytes,24,4);
-// Integer height = this.convertByteArrayToInt(dst_height);
-// log.debug("height "+height);
-//
-// byte[] dst_lengthPayload = this.extractByte(incomingBytes,28,4);
-// Integer lengthPayload = this.convertByteArrayToInt(dst_lengthPayload);
-// log.debug("lengthPayload "+lengthPayload);
-//
-//// byte[] dst_securityToken = this.extractByte(incomingBytes,32,lengthSecurityToken);
-//// String publicSID = new String(dst_securityToken);
-//// log.debug("publicSID "+publicSID);
-//
-// //byte[] imageBytes = this.extractByte(incomingBytes,32 + lengthSecurityToken,lengthPayload);
-//
-// byte[] imageBytes = new byte[0];
-//
-// //this.writeImageToDisc(imageBytes);
-// return new ServerFrameBean(mode, sequenceNumber, lengthSecurityToken, xValue, yValue,
-// width, height, lengthPayload, "1", imageBytes);
-//
} catch (Exception err) {
log.error("[handleReceivingBytes]",err);
}
return null;
}
-
- private byte[] extractByte(byte[] incomingByte, int start, int length) throws Exception {
- byte[] newByte = new byte[length];
-
- int index = 0;
- for (int i=start;i<start+length;i++) {
-
- newByte[index] = incomingByte[i];
-
- index++;
- }
-
- return newByte;
- }
-
- /**
- * For testing and debug issues
- *
- * @param imageBytes
- */
- private void writeImageToDisc(byte[] imageBytes) {
- try {
-
- Date t = new Date();
-
- FileOutputStream fos = new FileOutputStream("myImage"+t.getTime()+".jpg");
-
- fos.write(imageBytes, 0, imageBytes.length);
-
- fos.close();
-
- } catch (Exception err) {
- log.error("[writeImageToDisc]",err);
- }
- }
-
- private int convertByteArrayToInt(byte[] bytebuf) {
- ByteBuffer buffer = ByteBuffer.allocate(4);
- buffer.put(bytebuf);
- return buffer.getInt(0);
- }
-
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/EditorPaneLinkDetector.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/EditorPaneLinkDetector.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/EditorPaneLinkDetector.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/EditorPaneLinkDetector.java Mon Dec 19 15:37:27 2011
@@ -33,6 +33,7 @@ import javax.swing.text.html.parser.Pars
*
*/
public class EditorPaneLinkDetector extends JEditorPane {
+ private static final long serialVersionUID = 2811878994346374017L;
/**
* Creates a <code>EditorPaneLinkDetector</code>.
@@ -107,6 +108,11 @@ public class EditorPaneLinkDetector exte
protected class HTMLDocLinkDetector extends HTMLDocument {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1226244167782160437L;
+
public HTMLDocLinkDetector(StyleSheet ss) {
super(ss);
@@ -219,7 +225,7 @@ public class EditorPaneLinkDetector exte
if (matcher.find()) {
String url = matcher.group(1);
- String prefix = matcher.group(2);
+ //String prefix = matcher.group(2);
String endingSpaces = matcher.group(3);
// to ignore characters after the caret
Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/TestConnection.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/TestConnection.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/TestConnection.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/TestConnection.java Mon Dec 19 15:37:27 2011
@@ -1,47 +1,10 @@
package org.openmeetings.test;
-import java.io.File;
-
-//import org.apache.commons.httpclient.HttpClient;
-//import org.apache.commons.httpclient.methods.FileRequestEntity;
-//import org.apache.commons.httpclient.methods.PostMethod;
-//import org.apache.commons.httpclient.methods.RequestEntity;
-
public class TestConnection {
public static void main(String[] args) {
try {
-// System.out.println("Test Connection");
-//
-// // Get target URL
-// String strURL = "http:///manager/xml_rpc_server.php";
-// // Get file to be posted
-// String fileToPost = "createUser.xml";
-//
-// File f = new File(fileToPost);
-//
-// // Prepare HTTP post
-// PostMethod post = new PostMethod(strURL);
-// // Request content will be retrieved directly
-// // from the input stream
-// RequestEntity entity = new FileRequestEntity(f, "text/xml; charset=UTF-8");
-// post.setRequestEntity(entity);
-//
-//
-// // Get HTTP client
-// HttpClient httpclient = new HttpClient();
-//
-// // Execute request
-// int result = httpclient.executeMethod(post);
-// // Display status code
-// System.out.println("Response status code: " + result);
-// // Display response
-// System.out.println("Response body: ");
-// System.out.println(post.getResponseBodyAsString());
-
-
-
} catch (Exception err) {
err.printStackTrace();
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/batik/TestSVGExporter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/batik/TestSVGExporter.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/batik/TestSVGExporter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/batik/TestSVGExporter.java Mon Dec 19 15:37:27 2011
@@ -2,7 +2,6 @@ package org.openmeetings.test.batik;
import java.io.OutputStreamWriter;
import java.io.Writer;
-import java.util.Date;
import junit.framework.TestCase;
@@ -45,76 +44,11 @@ public class TestSVGExporter extends Tes
// Create an instance of the SVG Generator.
SVGGraphics2D svgGenerator = new SVGGraphics2D(document);
- SVGGraphics2D svgGenerator8 = new SVGGraphics2D(svgGenerator);
- //SVGGraphics2D svgGenerator2 = new SVGGraphics2D(document);
-
-// //NOTE: Font.ITALIC+Font.BOLD = Font AND Bold !
-// exportToImageTest.paintTextByWidthHeight(svgGenerator8, 500, 300, 100, 200, "Process 1 asd asd as dasas " +
-// " dasdasdasda sdasdad a das dasdas dasdasdasd Process 1 asd asd as dasas dasdasdasdasdasdad a das dasd" +
-// " asdasdasdasd Process 1 asd asd as dasasdasdasdasdasdasdad a das dasdasdasdasdasd", Font.BOLD, 28,
-// new Color(255,0,0));
-//
-// //Draw a Painting
-// SVGGraphics2D svgGenerator1 = new SVGGraphics2D(svgGenerator);
-// //SVGGraphics2D svgGenerator2 = new SVGGraphics2D(document);
-//
-// HashMap pointsList = new HashMap();
-// HashMap point = new HashMap();
-// point.put(0, "point");
-// point.put(1, 10);
-// point.put(2, 20);
-// point.put(3, 40);
-// point.put(4, 50);
-// pointsList.put(0, point);
-//
-// HashMap point2 = new HashMap();
-// point2.put(0, "point");
-// point2.put(1, 40);
-// point2.put(2, 50);
-// point2.put(3, 10);
-// point2.put(4, 200);
-// pointsList.put(1, point2);
-//
-// exportToImageTest.drawPointsObject(svgGenerator1, pointsList, new Color(255,0,0), 3, 0, 0, new Float(0.2));
-//
-// //Draw a Rect without fill
-// SVGGraphics2D svgGenerator3 = new SVGGraphics2D(svgGenerator);
-// exportToImageTest.paintRect2D(svgGenerator3, 10, 300, 100, 40, new Color(255,0,0),1,null,new Float(0.5));
-// //Draw rect without fill but with bigger border
-// SVGGraphics2D svgGenerator4 = new SVGGraphics2D(svgGenerator);
-// exportToImageTest.paintRect2D(svgGenerator4, 10, 350, 100, 40, new Color(0,255,0),5,null,new Float(0.5));
-//
-// //Draw rect with fill and thick border
-// SVGGraphics2D svgGenerator5 = new SVGGraphics2D(svgGenerator);
-// exportToImageTest.paintRect2D(svgGenerator5, 10, 400, 100, 40, new Color(0,255,0),5,new Color(0,0,255),new Float(0.5));
-//
-// //Draw rect with fill and without border
-// SVGGraphics2D svgGenerator6 = new SVGGraphics2D(svgGenerator);
-// exportToImageTest.paintRect2D(svgGenerator6, 10, 450, 100, 40, null,5,new Color(255,0,255),new Float(0.5));
-//
-//
-// //Draw a Ellipse without fill
-// SVGGraphics2D svgGenerator11 = new SVGGraphics2D(svgGenerator);
-// exportToImageTest.paintEllipse2D(svgGenerator11, 110, 300, 100, 40, new Color(255,0,0),1,null,new Float(0.5));
-// //Draw Ellipse without fill but with bigger border
-// SVGGraphics2D svgGenerator12 = new SVGGraphics2D(svgGenerator);
-// exportToImageTest.paintEllipse2D(svgGenerator12, 110, 350, 100, 40, new Color(0,255,0),5,null,new Float(0.5));
-//
-// //Draw Ellipse with fill and thick border
-// SVGGraphics2D svgGenerator13 = new SVGGraphics2D(svgGenerator);
-// exportToImageTest.paintEllipse2D(svgGenerator13, 110, 400, 100, 40, new Color(0,255,0),5,new Color(0,0,255),new Float(0.5));
-//
-// //Draw Ellipse with fill and without border
-// SVGGraphics2D svgGenerator14 = new SVGGraphics2D(svgGenerator);
-// exportToImageTest.paintEllipse2D(svgGenerator14, 110, 450, 100, 40, null,5,new Color(255,0,255),new Float(0.5));
-
// Finally, stream out SVG to the standard output using
// UTF-8 encoding.
boolean useCSS = true; // we want to use CSS style attributes
//Writer out = new OutputStreamWriter(System.out, "UTF-8");
- String requestedFile = "diagram_xyz_"+new Date().getTime()+".svg";
-
//OutputStream out = httpServletResponse.getOutputStream();
//httpServletResponse.setContentType("APPLICATION/OCTET-STREAM");
//httpServletResponse.setHeader("Content-Disposition","attachment; filename=\"" + requestedFile + "\"");
Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/batik/TestSVGTextExporter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/batik/TestSVGTextExporter.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/batik/TestSVGTextExporter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/batik/TestSVGTextExporter.java Mon Dec 19 15:37:27 2011
@@ -2,7 +2,6 @@ package org.openmeetings.test.batik;
import java.io.OutputStreamWriter;
import java.io.Writer;
-import java.util.Date;
import junit.framework.TestCase;
@@ -46,31 +45,11 @@ public class TestSVGTextExporter extends
// Create an instance of the SVG Generator.
SVGGraphics2D svgGenerator = new SVGGraphics2D(document);
- SVGGraphics2D svgGenerator8 = new SVGGraphics2D(svgGenerator);
- //SVGGraphics2D svgGenerator2 = new SVGGraphics2D(document);
-
-// //NOTE: Font.ITALIC+Font.BOLD = Font AND Bold !
-// exportToImageTest.paintTextByWidthHeight(svgGenerator8, 500, 300, 100, 200, "Process", Font.BOLD+Font.ITALIC, 28,
-// new Color(255,0,0));
-//
-// SVGGraphics2D svgGenerator11 = new SVGGraphics2D(svgGenerator);
-//
-// exportToImageTest.paintTextByWidthHeight(svgGenerator11, 100, 300, 100, 200, "Process", Font.BOLD+Font.ITALIC, 111,
-// new Color(255,0,0));
-
- SVGGraphics2D svgGenerator9 = new SVGGraphics2D(svgGenerator);
- //NOTE: Font.ITALIC+Font.BOLD = Font AND Bold !
-// exportToImageTest._paintTextByWidthHeight(svgGenerator9, 500, 300, 100, 200, "Hans", Font.BOLD, 28,
-// new Color(255,0,0));
-
-
// Finally, stream out SVG to the standard output using
// UTF-8 encoding.
boolean useCSS = true; // we want to use CSS style attributes
//Writer out = new OutputStreamWriter(System.out, "UTF-8");
- String requestedFile = "diagram_xyz_"+new Date().getTime()+".svg";
-
//OutputStream out = httpServletResponse.getOutputStream();
//httpServletResponse.setContentType("APPLICATION/OCTET-STREAM");
//httpServletResponse.setHeader("Content-Disposition","attachment; filename=\"" + requestedFile + "\"");
@@ -79,13 +58,6 @@ public class TestSVGTextExporter extends
//StringWriter out = new StringWriter();
svgGenerator.stream(out, useCSS);
- String xmlDef = out.toString();
-
-
- //log.debug("String: "+xmlDef);
-
-
-
} catch (Exception er) {
log.error("ERROR ", er);
System.out.println("Error exporting: " + er);
Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java Mon Dec 19 15:37:27 2011
@@ -2,9 +2,7 @@ package org.openmeetings.test.calendar;
//import groovy.sql.Sql;
-import java.text.SimpleDateFormat;
import java.util.Calendar;
-import java.util.Date;
import java.util.List;
import org.apache.log4j.Logger;
@@ -32,10 +30,6 @@ public class TestDatabaseStructureAppoin
cal.get(Calendar.DAY_OF_MONTH);
cal.getTime();
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
- Date date = format.parse("2008-11-07");
- Date date2 = format.parse("2008-11-08");
-
appointmentReminderTypDaoImpl.addAppointmentReminderTyps(1L,
"test 5 min", "comment");
List<AppointmentReminderTyps> listAppoints = appointmentReminderTypDaoImpl
Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java Mon Dec 19 15:37:27 2011
@@ -4,6 +4,7 @@ import org.apache.log4j.Logger;
import org.junit.Test;
import org.openmeetings.app.data.beans.basic.SearchResult;
import org.openmeetings.app.data.user.Usermanagement;
+import org.openmeetings.app.persistence.beans.user.Users;
import org.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +20,7 @@ public class TestDatabaseStructureUsersS
try {
- SearchResult users = userManagement.getAllUserByRange("first", 0, 10, "orderby", true);
+ SearchResult<Users> users = userManagement.getAllUserByRange("first", 0, 10, "orderby", true);
log.debug("[result]" + users.getResult().size());
log.debug("[records]"+ users.getRecords());
Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestGetAppointment.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestGetAppointment.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestGetAppointment.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestGetAppointment.java Mon Dec 19 15:37:27 2011
@@ -21,7 +21,7 @@ AbstractOpenmeetingsSpringTest {
@Test
public void getAppoinment() {
-
+ log.debug("getAppoinment enter");
Long userId = 1L;
Calendar starttime = GregorianCalendar.getInstance();
Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/chat/TestChatLinking.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/chat/TestChatLinking.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/chat/TestChatLinking.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/chat/TestChatLinking.java Mon Dec 19 15:37:27 2011
@@ -9,17 +9,6 @@ import org.junit.Test;
public class TestChatLinking extends TestCase {
- private Pattern patternUrl = null;
- private Matcher matchers = null;
-
- //private String url = "^(([\\w]+)?:\\/)?\\/?([^:\\/\\s]+)((\\/\\w+)*?\\/)?([\\w\\-\\.]+[^#?\\s]+)(.*)?(#[\\w\\-]+)?$";
- private String url = "(?i)(\\b(http://|https://|www.|ftp://|file:/|mailto:)\\S+)(\\s+)";
- private String linkBefore = "<u><FONT color=\"#0000CC\"><a href=\"";
- private String linkMiddleOne = "\" title=\"";
- private String linkMiddleTwo = "\" target=\"_blank\">";
- private String linkAfter = "</a></FONT></u>";
- private String output, protocol;
-
@Test
public void testChatParser(){
try {
Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/gui/TestGui.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/gui/TestGui.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/gui/TestGui.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/gui/TestGui.java Mon Dec 19 15:37:27 2011
@@ -2,11 +2,7 @@ package org.openmeetings.test.gui;
import junit.framework.TestCase;
-import org.apache.log4j.Logger;
-
public class TestGui extends TestCase {
-
- private static final Logger log = Logger.getLogger(TestGui.class);
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/jai/TestSVGTextExporterArrow.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/jai/TestSVGTextExporterArrow.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/jai/TestSVGTextExporterArrow.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/jai/TestSVGTextExporterArrow.java Mon Dec 19 15:37:27 2011
@@ -2,7 +2,6 @@ package org.openmeetings.test.jai;
import java.io.OutputStreamWriter;
import java.io.Writer;
-import java.util.Date;
import junit.framework.TestCase;
@@ -11,7 +10,6 @@ import org.apache.batik.dom.svg.SVGDOMIm
import org.apache.batik.svggen.SVGGraphics2D;
import org.apache.log4j.Logger;
import org.junit.Test;
-import org.openmeetings.servlet.outputhandler.ExportToImage;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -25,8 +23,6 @@ public class TestSVGTextExporterArrow ex
try {
- ExportToImage exportToImageTest = new ExportToImage();
-
// Get a DOMImplementation.
DOMImplementation domImpl =
GenericDOMImplementation.getDOMImplementation();
@@ -67,23 +63,11 @@ public class TestSVGTextExporterArrow ex
// new Color(255,0,0));
- SVGGraphics2D svgGenerator10 = new SVGGraphics2D(svgGenerator);
- //SVGGraphics2D svgGenerator2 = new SVGGraphics2D(document);
-
- //NOTE: Font.ITALIC+Font.BOLD = Font AND Bold !
-// GeomPoint start = new GeomPoint();
-// start.setLocation(100,100);
-// GeomPoint end = new GeomPoint();
-// end.setLocation(300,600);
-// exportToImageTest.drawArrow(svgGenerator10, start, end, 4, new Float(0.5),new Color(255,0,0),new Color(0,0,255));
-
// Finally, stream out SVG to the standard output using
// UTF-8 encoding.
boolean useCSS = true; // we want to use CSS style attributes
//Writer out = new OutputStreamWriter(System.out, "UTF-8");
- String requestedFile = "diagram_xyz_"+new Date().getTime()+".svg";
-
//OutputStream out = httpServletResponse.getOutputStream();
//httpServletResponse.setContentType("APPLICATION/OCTET-STREAM");
//httpServletResponse.setHeader("Content-Disposition","attachment; filename=\"" + requestedFile + "\"");
@@ -92,13 +76,6 @@ public class TestSVGTextExporterArrow ex
//StringWriter out = new StringWriter();
svgGenerator.stream(out, useCSS);
- String xmlDef = out.toString();
-
-
- //log.debug("String: "+xmlDef);
-
-
-
} catch (Exception er) {
log.error("ERROR ", er);
System.out.println("Error exporting: " + er);
Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/navi/TestNavi.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/navi/TestNavi.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/navi/TestNavi.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/navi/TestNavi.java Mon Dec 19 15:37:27 2011
@@ -32,22 +32,22 @@ public class TestNavi extends AbstractOp
Long organization_id = iter.next().getOrganisation()
.getOrganisation_id();
- List ll = mService.getNavi(sessionData.getSession_id(), 1, organization_id);
+ List<Naviglobal> ll = mService.getNavi(sessionData.getSession_id(), 1, organization_id);
System.out.println("NaviGlobal size: " + ll.size());
- for (Iterator it2 = ll.iterator(); it2.hasNext();) {
- Naviglobal navigl = (Naviglobal) it2.next();
+ for (Iterator<Naviglobal> it2 = ll.iterator(); it2.hasNext();) {
+ Naviglobal navigl = it2.next();
System.out.println(navigl.getLabel().getValue());
- List s = navigl.getMainnavi();
+ List<Navimain> s = navigl.getMainnavi();
- for (Iterator it3 = s.iterator(); it3.hasNext();) {
- Navimain navim = (Navimain) it3.next();
+ for (Iterator<Navimain> it3 = s.iterator(); it3.hasNext();) {
+ Navimain navim = it3.next();
System.out.println("-->" + navim.getLabel().getValue());
- for (Iterator it4 = navim.getSubnavi().iterator(); it4
+ for (Iterator<Navisub> it4 = navim.getSubnavi().iterator(); it4
.hasNext();) {
- Navisub navis = (Navisub) it4.next();
+ Navisub navis = it4.next();
System.out.println("---->"
+ navis.getLabel().getValue());
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/rdc/KeyCodesTest.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/rdc/KeyCodesTest.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/rdc/KeyCodesTest.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/rdc/KeyCodesTest.java Mon Dec 19 15:37:27 2011
@@ -62,9 +62,9 @@ public class KeyCodesTest extends Frame
System.out.println("keyPressed CHAR3 "+event.getKeyChar());
- System.out.println("keyPressed CHAR4 "+event.getKeyText(event.getKeyCode()));
+ System.out.println("keyPressed CHAR4 "+KeyEvent.getKeyText(event.getKeyCode()));
- System.out.println("keyPressed CHAR5 "+event.getKeyText(myCode));
+ System.out.println("keyPressed CHAR5 "+KeyEvent.getKeyText(myCode));
System.out.println("keyPressed isActionKey "+event.isActionKey());
System.out.println("keyPressed isAltDown "+event.isAltDown());
Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/rdc/ReadKeyCodesTest.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/rdc/ReadKeyCodesTest.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/rdc/ReadKeyCodesTest.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/rdc/ReadKeyCodesTest.java Mon Dec 19 15:37:27 2011
@@ -4,11 +4,12 @@ import java.awt.*;
import java.awt.event.*;
public class ReadKeyCodesTest extends Frame implements KeyListener {
+ private static final long serialVersionUID = -1722917067803656922L;
String msg1 = "";
String msg2 = "";
public static void main(String[] args) {
- ReadKeyCodesTest wnd = new ReadKeyCodesTest();
+ new ReadKeyCodesTest();
}
public ReadKeyCodesTest() {
Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/rss/TestRssLoader.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/rss/TestRssLoader.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/rss/TestRssLoader.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/rss/TestRssLoader.java Mon Dec 19 15:37:27 2011
@@ -1,6 +1,7 @@
package org.openmeetings.test.rss;
import org.apache.log4j.Logger;
+import org.junit.Test;
import org.openmeetings.app.rss.LoadAtomRssFeed;
import org.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.springframework.beans.factory.annotation.Autowired;
@@ -11,7 +12,9 @@ public class TestRssLoader extends Abstr
@Autowired
private LoadAtomRssFeed loadAtomRssFeed;
+ @Test
public void testLoadRssFeed(){
+ log.debug("testLoadRssFeed enter");
String url = "http://groups.google.com/group/openmeetings-user/feed/atom_v1_0_msgs.xml";
loadAtomRssFeed.parseRssFeed(url);
Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/server/TestWebStartGui.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/server/TestWebStartGui.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/server/TestWebStartGui.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/server/TestWebStartGui.java Mon Dec 19 15:37:27 2011
@@ -25,7 +25,7 @@ public class TestWebStartGui extends Tes
String publicSID = "testw";
String record = "no";
- ClientStartScreen clientStartScreen = new ClientStartScreen(url,"4445", SID, room, domain, publicSID, record,"");
+ new ClientStartScreen(url,"4445", SID, room, domain, publicSID, record,"");
try {
Thread.sleep(100000000);
Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/server/TestWebStartViewerGui.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/server/TestWebStartViewerGui.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/server/TestWebStartViewerGui.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/server/TestWebStartViewerGui.java Mon Dec 19 15:37:27 2011
@@ -26,7 +26,7 @@ public class TestWebStartViewerGui exten
String publicSID = "testw";
String record = "no";
- ClientViewerScreen clientViewerScreen = new ClientViewerScreen(url,"4445", SID, room, domain, publicSID, record,"");
+ new ClientViewerScreen(url,"4445", SID, room, domain, publicSID, record,"");
try {
Thread.sleep(100000000);
Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/sip/TestDebugConnection.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/sip/TestDebugConnection.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/sip/TestDebugConnection.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/sip/TestDebugConnection.java Mon Dec 19 15:37:27 2011
@@ -114,9 +114,9 @@ public class TestDebugConnection extends
if (result instanceof Map) {
- Map mapResults = (Map) result;
+ Map<?, ?> mapResults = (Map<?, ?>) result;
- for (Iterator iter = mapResults.keySet().iterator();iter.hasNext();) {
+ for (Iterator<?> iter = mapResults.keySet().iterator();iter.hasNext();) {
Object key = iter.next();
log.debug("-- key "+key+" value "+mapResults.get(key));
@@ -223,9 +223,9 @@ public class TestDebugConnection extends
if (result instanceof Map) {
- Map mapResults = (Map) result;
+ Map<?, ?> mapResults = (Map<?, ?>) result;
- for (Iterator iter = mapResults.keySet().iterator();iter.hasNext();) {
+ for (Iterator<?> iter = mapResults.keySet().iterator();iter.hasNext();) {
Object key = iter.next();
log.debug("-- key "+key+" value "+mapResults.get(key));
Modified: incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebService.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebService.java Mon Dec 19 15:37:27 2011
@@ -1242,7 +1242,7 @@ public class UserWebService {
* asc or desc
* @return
*/
- public SearchResult getUsersByOrganisation(String SID,
+ public SearchResult<Users> getUsersByOrganisation(String SID,
long organisation_id, int start, int max, String orderby,
boolean asc) {
try {
@@ -1254,7 +1254,7 @@ public class UserWebService {
start, max, orderby, asc);
} else {
log.error("Need Administration Account");
- SearchResult sResult = new SearchResult();
+ SearchResult<Users> sResult = new SearchResult<Users>();
sResult.setErrorId(-26L);
return sResult;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebServiceFacade.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebServiceFacade.java?rev=1220801&r1=1220800&r2=1220801&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebServiceFacade.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebServiceFacade.java Mon Dec 19 15:37:27 2011
@@ -8,6 +8,7 @@ import org.apache.axis2.transport.http.H
import org.openmeetings.app.data.beans.basic.ErrorResult;
import org.openmeetings.app.data.beans.basic.SearchResult;
import org.openmeetings.app.persistence.beans.basic.Sessiondata;
+import org.openmeetings.app.persistence.beans.user.Users;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -169,6 +170,7 @@ public class UserWebServiceFacade {
* @return
* @throws AxisFault
*/
+ @Deprecated
public Long setUserObject(String SID, String username, String firstname,
String lastname, String profilePictureUrl, String email)
throws AxisFault {
@@ -195,6 +197,7 @@ public class UserWebServiceFacade {
* @return
* @throws AxisFault
*/
+ @Deprecated
public Long setUserObjectWithExternalUser(String SID, String username,
String firstname, String lastname, String profilePictureUrl,
String email, Long externalUserId, String externalUserType)
@@ -277,7 +280,7 @@ public class UserWebServiceFacade {
organisation_id, insertedby, comment);
}
- public SearchResult getUsersByOrganisation(String SID,
+ public SearchResult<Users> getUsersByOrganisation(String SID,
long organisation_id, int start, int max, String orderby,
boolean asc) throws AxisFault {
return getUserServiceProxy().getUsersByOrganisation(SID,