Author: sebawagner
Date: Sun Jan 29 11:44:30 2012
New Revision: 1237251
URL: http://svn.apache.org/viewvc?rev=1237251&view=rev
Log:
OPENMEETINGS-32 Replace JOD Library with own implementation Make JOD an
external, manually added library by the end-user and add configuration option
to Installer
Added:
incubator/openmeetings/trunk/singlewebapp/test/cmd.txt
incubator/openmeetings/trunk/singlewebapp/test/tt.bat
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/GeneratePDF.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/GenerateSWF.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Install.java
incubator/openmeetings/trunk/singlewebapp/src/templates/install_step1_EN.vm
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/GeneratePDF.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/GeneratePDF.java?rev=1237251&r1=1237250&r2=1237251&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/GeneratePDF.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/GeneratePDF.java
Sun Jan 29 11:44:30 2012
@@ -19,9 +19,12 @@
package org.openmeetings.app.documents;
import java.io.File;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
import java.util.HashMap;
import org.apache.commons.transaction.util.FileHelper;
+import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -36,6 +39,8 @@ public class GeneratePDF {
private GenerateThumbs generateThumbs;
@Autowired
private GenerateSWF generateSWF;
+ @Autowired
+ private Configurationmanagement cfgManagement;
public HashMap<String, HashMap<String, String>> convertPDF(
String current_dir, String fileName, String fileExt,
@@ -135,35 +140,65 @@ public class GeneratePDF {
}
/**
- * Generates PDF and thumbs (and swf).
+ * Generates PDF using JOD Library (external library)
*/
public HashMap<String, String> doJodConvert(String current_dir,
String fileFullPath, String destinationFolder, String
outputfile) {
- // Path to all JARs of JOD
- String jodClassPathFolder = current_dir + "jod" +
File.separatorChar;
+ try {
+
+ String jodPath = cfgManagement.getConfValue("jod.path",
+ String.class, "./jod");
+
+ File jodFolder = new File(jodPath);
+ if (!jodFolder.exists() || !jodFolder.isDirectory()) {
+ new Exception("Path to JOD Library folder does
not exist");
+ }
+
+ ArrayList<String> argv = new ArrayList<String>();
+ argv.add("java");
- // Create the Content of the Converter Script (.bat or .sh File)
- String[] argv = new String[] {
- "java",
- "-cp",
- "\"" + jodClassPathFolder +
"commons-cli-1.2.jar\" -cp \""
- + jodClassPathFolder +
"commons-io-1.4.jar\" -cp \""
- + jodClassPathFolder
- + "jodconverter-2.2.2.jar\" -cp
\""
- + jodClassPathFolder
- + "jodconverter-cli-2.2.2.jar\"
-cp \""
- + jodClassPathFolder +
"juh-3.0.1.jar\" -cp \""
- + jodClassPathFolder +
"jurt-3.0.1.jar\" -cp \""
- + jodClassPathFolder +
"ridl-3.0.1.jar\" -cp \""
- + jodClassPathFolder +
"slf4j-api-1.5.6.jar\" -cp \""
- + jodClassPathFolder +
"slf4j-jdk14-1.5.6.jar\" -cp \""
- + jodClassPathFolder +
"unoil-3.0.1.jar\" -cp \""
- + jodClassPathFolder +
"xstream-1.3.1.jar\"", "-jar",
- jodClassPathFolder +
"jodconverter-cli-2.2.2.jar",
- fileFullPath, destinationFolder + outputfile +
".pdf" };
+ String jodConverterJar = "";
- return GenerateSWF.executeScript("doJodConvert", argv);
+ for (String jarFiles : jodFolder.list(new
FilenameFilter() {
+ public boolean accept(File file1, String name) {
+ return name.endsWith(".jar");
+ }
+ })) {
+ argv.add("-cp");
+ if (jarFiles.startsWith("jodconverter")) {
+ jodConverterJar = jarFiles;
+ }
+ argv.add(jodFolder.getAbsolutePath() +
File.separatorChar
+ + jarFiles);
+ }
+ if (jodConverterJar.length() == 0) {
+ new Exception(
+ "Could not find jodConverter
JAR file in JOD folder");
+ }
+
+ argv.add("-jar");
+ argv.add(jodFolder.getAbsolutePath() +
File.separatorChar
+ + jodConverterJar);
+ argv.add(fileFullPath);
+ argv.add(destinationFolder + outputfile + ".pdf");
+
+ return GenerateSWF.executeScript("doJodConvert",
+ argv.toArray(new String[argv.size()]));
+
+ } catch (Exception ex) {
+ log.error("doJodConvert", ex);
+ return buildErrorMessage("doJodConvert",
ex.getMessage(), ex);
+ }
+ }
+ private HashMap<String, String> buildErrorMessage(String process,
+ String error, Exception ex) {
+ HashMap<String, String> returnMap = new HashMap<String,
String>();
+ returnMap.put("process", process);
+ returnMap.put("exception", ex.toString());
+ returnMap.put("error", error);
+ returnMap.put("exitValue", "-1");
+ return returnMap;
}
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/GenerateSWF.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/GenerateSWF.java?rev=1237251&r1=1237250&r2=1237251&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/GenerateSWF.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/GenerateSWF.java
Sun Jan 29 11:44:30 2012
@@ -104,10 +104,17 @@ public class GenerateSWF {
}
} catch (TimeoutException e) {
// Timeout exception is processed above
+ log.error("executeScript",e);
+ e.printStackTrace();
+ returnMap.put("error", e.getMessage());
+ returnMap.put("exception", e.toString());
+ returnMap.put("exitValue", "-1");
} catch (Throwable t) {
// Any other exception is shown in debug window
+ log.error("executeScript",t);
t.printStackTrace();
returnMap.put("error", t.getMessage());
+ returnMap.put("exception", t.toString());
returnMap.put("exitValue", "-1");
}
return returnMap;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java?rev=1237251&r1=1237250&r2=1237251&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Sun Jan 29 11:44:30 2012
@@ -88,7 +88,7 @@ public class ImportInitvalues {
private AppointmentReminderTypDaoImpl appointmentReminderTypDaoImpl;
@Autowired
private PollManagement pollManagement;
-
+
public void loadMainMenu() {
userManagement.addUserLevel("User", 1);
@@ -252,7 +252,7 @@ public class ImportInitvalues {
String openxg_client_domain, String
openxg_community_code,
String openxg_language_code, String openxg_adminid,
String sip_language_phonecode, String
sip_phonerange_start,
- String sip_phonerange) {
+ String sip_phonerange, String jodPath) {
cfgManagement
.addConfByKey(
@@ -261,9 +261,9 @@ public class ImportInitvalues {
crypt_ClassName,
null,
"This Class is used for
Authentification-Crypting. "
- + "Be carefull what you do
here! If you change it while "
- + "running previous Pass of
users will not be workign anymore! "
- + "for more Information see
http://code.google.com/p/openmeetings/wiki/CustomCryptMechanism";);
+ + "Be carefull
what you do here! If you change it while "
+ + "running
previous Pass of users will not be workign anymore! "
+ + "for more
Information see
http://code.google.com/p/openmeetings/wiki/CustomCryptMechanism";);
cfgManagement.addConfByKey(3, "screen_viewer", screen_viewer,
null,
"ScreenViewer Type(0==standard, 1==
jrdesktop)");
@@ -296,7 +296,8 @@ public class ImportInitvalues {
cfgManagement.addConfByKey(3, "mail.smtp.starttls.enable",
mailusetls,
null, "Enable TLS 1=true, 0=false");
- cfgManagement.addConfByKey(3, "application.name",
Configurationmanagement.DEFAULT_APP_NAME, null,
+ cfgManagement.addConfByKey(3, "application.name",
+ Configurationmanagement.DEFAULT_APP_NAME, null,
"Name of the Browser Title window");
// "1" == "EN"
@@ -488,203 +489,233 @@ public class ImportInitvalues {
null,
"Display name of the user who
draw the current object (User Name auto-disapper after 3 seconds.");
- cfgManagement.addConfByKey(3, "max_upload_size", new
Integer(ImportHelper.DEFAULT_MAX_UPLOAD_SIZE).toString(), null,
- "Maximum size of upload file (bytes)");
//defaults to 1GB
+ cfgManagement.addConfByKey(3, "max_upload_size", new Integer(
+
ImportHelper.DEFAULT_MAX_UPLOAD_SIZE).toString(), null,
+ "Maximum size of upload file (bytes)"); //
defaults to 1GB
+
+ cfgManagement
+ .addConfByKey(
+ 3,
+ "number.minutes.reminder.send",
+ "15",
+ null,
+ "The number of minutes before
reminder emails are send. Set to 0 to disable reminder emails");
- cfgManagement.addConfByKey(3, "number.minutes.reminder.send",
"15", null,
- "The number of minutes before reminder emails
are send. Set to 0 to disable reminder emails");
-
cfgManagement.addConfByKey(3, "user.login.minimum.length", "4",
null,
"Number of chars needed in a user login");
-
+
cfgManagement.addConfByKey(3, "user.pass.minimum.length", "4",
null,
"Number of chars needed in a user login");
-
- cfgManagement.addConfByKey(3,
"calendar.conference.rooms.default.size", "50", null,
- "Default number of participants conference room
created via calendar");
-
- cfgManagement.addConfByKey(3,
"use.old.style.ffmpeg.map.option", "0", null,
- "specify a 1 if you would like to use old
FFMPEG -map option with 0.0 instead of 0:0");
-
- // give exclusive audio key code
- cfgManagement.addConfByKey(3, "exclusive.audio.keycode", "123", null,
- "A hot key code for the 'give exclusive audio'
functionality. 123 if F12");
+
+ cfgManagement
+ .addConfByKey(3,
"calendar.conference.rooms.default.size",
+ "50", null,
+ "Default number of participants
conference room created via calendar");
+
+ cfgManagement
+ .addConfByKey(
+ 3,
+
"use.old.style.ffmpeg.map.option",
+ "0",
+ null,
+ "specify a 1 if you would like
to use old FFMPEG -map option with 0.0 instead of 0:0");
+
+ // give exclusive audio key code
+ cfgManagement
+ .addConfByKey(
+ 3,
+ "exclusive.audio.keycode",
+ "123",
+ null,
+ "A hot key code for the 'give
exclusive audio' functionality. Keycode 123 is F12");
+
+ cfgManagement
+ .addConfByKey(
+ 3,
+ "jod.path",
+ jodPath,
+ null,
+ "The path to JOD library
(http://code.google.com/p/jodconverter), configure the path to point to the lib
directory of JOD that contains also the jodconverter-core-version.jar");
+
}
-
public void loadDefaultRooms(boolean createRooms) {
- long conference_Id = roommanagement.addRoomType("conference
(1-25 users)");
+ long conference_Id = roommanagement
+ .addRoomType("conference (1-25 users)");
log.debug("conference_Id: " + conference_Id);
long audience_Id = roommanagement.addRoomType("audience (1-50
users)");
log.debug("audience_Id: " + audience_Id);
- long restricted_Id = roommanagement.addRoomType("restricted
(1-150 users)");
+ long restricted_Id = roommanagement
+ .addRoomType("restricted (1-150 users)");
log.debug("restricted_Id: " + restricted_Id);
- long interview_Id = roommanagement.addRoomType("interview (1:1
meeting with recording)");
+ long interview_Id = roommanagement
+ .addRoomType("interview (1:1 meeting with
recording)");
log.debug("interview_Id: " + interview_Id);
- long custom_Id = roommanagement.addRoomType("custom (extension
point for your plugin)");
+ long custom_Id = roommanagement
+ .addRoomType("custom (extension point for your
plugin)");
log.debug("custom_Id: " + custom_Id);
if (createRooms) {
- roommanagement.addRoom(3, "public Interview Room",
interview_Id, "",
- new Long(16), true, null, false, false,
null, false, null,
- true, false, false, "", "", "", null,
null, null,
+ roommanagement.addRoom(3, "public Interview Room",
interview_Id,
+ "", new Long(16), true, null, false,
false, null, false,
+ null, true, false, false, "", "", "",
null, null, null,
false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
false, // hideFilesExplorer
false, // hideActionsMenu
- false, // hideScreenSharing
+ false, // hideScreenSharing
false, // hideWhiteboard
- false //showMicrophoneStatus
+ false // showMicrophoneStatus
);
-
- roommanagement.addRoom(3, "public Conference Room",
conference_Id, "",
- new Long(32), true, null, false, false,
null, false, null,
- true, false, false, "", "", "", null,
null, null,
+
+ roommanagement.addRoom(3, "public Conference Room",
conference_Id,
+ "", new Long(32), true, null, false,
false, null, false,
+ null, true, false, false, "", "", "",
null, null, null,
false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
false, // hideFilesExplorer
false, // hideActionsMenu
- false, // hideScreenSharing
+ false, // hideScreenSharing
false, // hideWhiteboard
- false //showMicrophoneStatus
+ false // showMicrophoneStatus
);
-
- roommanagement.addRoom(3, "public Video Only Room",
conference_Id, "",
- new Long(32), true, null, false, false,
null, false, null,
- true, false, false, "", "", "", null,
null, null,
+
+ roommanagement.addRoom(3, "public Video Only Room",
conference_Id,
+ "", new Long(32), true, null, false,
false, null, false,
+ null, true, false, false, "", "", "",
null, null, null,
false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
false, // hideFilesExplorer
false, // hideActionsMenu
- false, // hideScreenSharing
+ false, // hideScreenSharing
false, // hideWhiteboard
- false //showMicrophoneStatus
+ false // showMicrophoneStatus
);
-
+
roommanagement.addRoom(3, "public Video And Whiteboard
Room",
conference_Id, "", new Long(32), true,
null, false, false,
- null, false, null, true, false, false,
"", "", "", null, null,
- null,
- false, // hideTopBar
+ null, false, null, true, false, false,
"", "", "", null,
+ null, null, false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
false, // hideFilesExplorer
false, // hideActionsMenu
- false, // hideScreenSharing
+ false, // hideScreenSharing
false, // hideWhiteboard
- false //showMicrophoneStatus
+ false // showMicrophoneStatus
);
-
- roommanagement.addRoom(3, "public Restricted Room",
restricted_Id, "",
- new Long(100), true, null, false,
false, null, false, null,
- true, false, false, "", "", "", null,
null, null,
+
+ roommanagement.addRoom(3, "public Restricted Room",
restricted_Id,
+ "", new Long(100), true, null, false,
false, null, false,
+ null, true, false, false, "", "", "",
null, null, null,
false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
false, // hideFilesExplorer
false, // hideActionsMenu
- false, // hideScreenSharing
+ false, // hideScreenSharing
false, // hideWhiteboard
- false //showMicrophoneStatus
+ false // showMicrophoneStatus
);
- roommanagement.addRoom(3, "restricted room with micro option set",
restricted_Id, "",
- new Long(100), true, null, false,
false, null, false, null,
- true, false, false, "", "", "", null,
null, null,
- false, // hideTopBar
+ roommanagement.addRoom(3, "restricted room with micro
option set",
+ restricted_Id, "", new Long(100), true,
null, false, false,
+ null, false, null, true, false, false,
"", "", "", null,
+ null, null, false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
false, // hideFilesExplorer
false, // hideActionsMenu
- false, // hideScreenSharing
+ false, // hideScreenSharing
false, // hideWhiteboard
- true //showMicrophoneStatus
+ true // showMicrophoneStatus
);
- roommanagement.addRoom(3, "conference room with micro option set",
conference_Id, "",
- new Long(32), true, null, false, false,
null, false, null,
- true, false, false, "", "", "", null,
null, null,
- false, // hideTopBar
+ roommanagement.addRoom(3, "conference room with micro
option set",
+ conference_Id, "", new Long(32), true,
null, false, false,
+ null, false, null, true, false, false,
"", "", "", null,
+ null, null, false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
false, // hideFilesExplorer
false, // hideActionsMenu
- false, // hideScreenSharing
+ false, // hideScreenSharing
false, // hideWhiteboard
- true //showMicrophoneStatus
+ true // showMicrophoneStatus
);
-
+
long room2 = roommanagement.addRoom(3, "private
Conference Room",
conference_Id, "", new Long(32), false,
null, false, false,
- null, false, null, true, false, false,
"", "", "", null, null,
- null,
- false, // hideTopBar
+ null, false, null, true, false, false,
"", "", "", null,
+ null, null, false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
false, // hideFilesExplorer
false, // hideActionsMenu
- false, // hideScreenSharing
+ false, // hideScreenSharing
false, // hideWhiteboard
- false //showMicrophoneStatus
+ false // showMicrophoneStatus
);
-
+
roommanagement.addRoomToOrganisation(3, room2, 1);
-
+
roommanagement.addRoom(3, "public Audience Room",
audience_Id, "",
new Long(32), true, null, false, false,
null, false, null,
- true, false, false, "", "", "", null,
null, null,
- false, // hideTopBar
+ true, false, false, "", "", "", null,
null, null, false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
false, // hideFilesExplorer
false, // hideActionsMenu
- false, // hideScreenSharing
+ false, // hideScreenSharing
false, // hideWhiteboard
- false //showMicrophoneStatus
+ false // showMicrophoneStatus
);
-
+
long room4 = roommanagement.addRoom(3, "private
Audience Room",
- audience_Id, "", new Long(32), false,
null, false, false, null,
- false, null, true, false, false, "",
"", "", null, null, null,
- false, // hideTopBar
+ audience_Id, "", new Long(32), false,
null, false, false,
+ null, false, null, true, false, false,
"", "", "", null,
+ null, null, false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
false, // hideFilesExplorer
false, // hideActionsMenu
- false, // hideScreenSharing
+ false, // hideScreenSharing
false, // hideWhiteboard
- false //showMicrophoneStatus
+ false // showMicrophoneStatus
);
-
+
roommanagement.addRoomToOrganisation(3, room4, 1);
}
}
public void loadInitUserAndOrganisation(String username, String
userpass,
- String email, String defaultOrganisationName, String
timeZone, String configdefaultLang) {
+ String email, String defaultOrganisationName, String
timeZone,
+ String configdefaultLang) {
// Add user
try {
-
+
Long default_lang_id =
Long.parseLong(configdefaultLang);
- if (default_lang_id == null) default_lang_id = 1L;
-
+ if (default_lang_id == null)
+ default_lang_id = 1L;
+
// Add default group
Long organisation_id =
organisationmanagement.addOrganisation(
defaultOrganisationName, 1);
-
+
// BaseUrl as param is empty as we do not send an EMAIL
here
Long user_id = userManagement.registerUserInit(new
Long(3), 3, 1,
1, username, userpass, "lastname",
"firstname", email,
new java.util.Date(), "street", "no",
"fax", "zip", 1,
- "town", default_lang_id, false,
Arrays.asList(organisation_id), "phone", "", false, "", "", "",
- false, timeZone, false, "", "", false,
true);
+ "town", default_lang_id, false,
+ Arrays.asList(organisation_id),
"phone", "", false, "", "",
+ "", false, timeZone, false, "", "",
false, true);
log.debug("Installation - User Added user-Id " +
user_id);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Install.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Install.java?rev=1237251&r1=1237250&r2=1237251&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Install.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Install.java
Sun Jan 29 11:44:30 2012
@@ -328,6 +328,9 @@ public class Install extends VelocityVie
String timeZone = httpServletRequest
.getParameter("timeZone");
+
+ String jodPath = httpServletRequest
+
.getParameter("jodPath");
log.debug("step 0+ start init with
values. " + username
+ " ***** " + useremail
+ " " + orgname + " "
@@ -364,7 +367,8 @@ public class Install extends VelocityVie
openxg_client_secret,
openxg_client_domain,
openxg_community_code,
openxg_language_code,
openxg_adminid,
sip_language_phonecode,
- sip_phonerange_start,
sip_phonerange);
+ sip_phonerange_start,
sip_phonerange,
+ jodPath);
getImportInitvalues().loadInitUserAndOrganisation(username,
userpass, useremail,
orgname, timeZone, configdefaultLang);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/templates/install_step1_EN.vm
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/templates/install_step1_EN.vm?rev=1237251&r1=1237250&r2=1237251&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/templates/install_step1_EN.vm
(original)
+++ incubator/openmeetings/trunk/singlewebapp/src/templates/install_step1_EN.vm
Sun Jan 29 11:44:30 2012
@@ -285,6 +285,12 @@ function checkEmail()
<input name="sox_path" id="sox_path" size="27" title="Enter the path
to SoX, leave blank if SoX is successfully installed to system-path"
type="text" />
<p><i>see also <a
href="http://code.google.com/p/openmeetings/wiki/ConvertersInstallation";
target="_blank">ConvertersInstallation</a></i></p>
</li>
+ <li>
+ <label for="jod_path">JOD Path</label>
+ <input name="jod_path" id="jod_path" size="27"
value="./jodconverter-core-3.0-beta-4/lib"
+ title="The path to JOD library
(http://code.google.com/p/jodconverter), configure the path to point to the lib
directory of JOD that contains also the jodconverter-core-version.jar"
type="text" />
+ <p><i>see also <a
href="http://code.google.com/p/openmeetings/wiki/ConvertersInstallation";
target="_blank">ConvertersInstallation</a></i></p>
+ </li>
</fieldset>
<fieldset id="userConf2">
Modified:
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java?rev=1237251&r1=1237250&r2=1237251&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
Sun Jan 29 11:44:30 2012
@@ -83,6 +83,7 @@ public abstract class AbstractOpenmeetin
private static final String sip_language_phonecode = "";
private static final String sip_phonerange_start = "";
private static final String sip_phonerange = "";
+ private static final String jodPath = "./jod/lib";
private static final String username = "junit";
private static final String userpass = "test";
private static final String orgname = "smoketest";
@@ -179,7 +180,8 @@ public abstract class AbstractOpenmeetin
sip_forcetunnel, sip_openxg_enable,
openxg_wrapper_url,
openxg_client_id, openxg_client_secret,
openxg_client_domain,
openxg_community_code, openxg_language_code,
openxg_adminid,
- sip_language_phonecode, sip_phonerange_start,
sip_phonerange);
+ sip_language_phonecode, sip_phonerange_start,
sip_phonerange,
+ jodPath);
importInitvalues.loadInitUserAndOrganisation(username, userpass,
useremail, orgname, timeZone,
configdefaultLang);
Added: incubator/openmeetings/trunk/singlewebapp/test/cmd.txt
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/test/cmd.txt?rev=1237251&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/test/cmd.txt (added)
+++ incubator/openmeetings/trunk/singlewebapp/test/cmd.txt Sun Jan 29 11:44:30
2012
@@ -0,0 +1,4 @@
+java -cp
C:/work/openmeetings/jodconverter-core-3.0-beta-4-dist/jodconverter-core-3.0-beta-4/libcommons-cli-1.1.jar;C:/work/openmeetings/jodconverter-core-3.0-beta-4-dist/jodconverter-core-3.0-beta-4/libcommons-io-1.4.jar;C:/work/openmeetings/jodconverter-core-3.0-beta-4-dist/jodconverter-core-3.0-beta-4/libjodconverter-core-3.0-beta-4.jar;C:/work/openmeetings/jodconverter-core-3.0-beta-4-dist/jodconverter-core-3.0-beta-4/libjson-20090211.jar;C:/work/openmeetings/jodconverter-core-3.0-beta-4-dist/jodconverter-core-3.0-beta-4/libjuh-3.2.1.jar;C:/work/openmeetings/jodconverter-core-3.0-beta-4-dist/jodconverter-core-3.0-beta-4/libjurt-3.2.1.jar;C:/work/openmeetings/jodconverter-core-3.0-beta-4-dist/jodconverter-core-3.0-beta-4/libridl-3.2.1.jar;C:/work/openmeetings/jodconverter-core-3.0-beta-4-dist/jodconverter-core-3.0-beta-4/libunoil-3.2.1.jar
jodconverter-core-3.0-beta-4.jar
C:/Users/swagner/workspaces/indigo_asf_2/ROOT/dist/red5/webapps/openmeetings/uploadtemp/files/4b6c9b2
0a4161b8729a7c2f72a900bd9.odt
C:/Users/swagner/workspaces/indigo_asf_2/ROOT/dist/red5/webapps/openmeetings/upload/files/4b6c9b20a4161b8729a7c2f72a900bd9/4b6c9b20a4161b8729a7c2f72a900bd9.pdf
+
+
+java -cp
C:/work/openmeetings/jodconverter-core-3.0-beta-4-dist/jodconverter-core-3.0-beta-4/lib/
pp.odt ppp.pdf
\ No newline at end of file
Added: incubator/openmeetings/trunk/singlewebapp/test/tt.bat
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/test/tt.bat?rev=1237251&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/test/tt.bat (added)
+++ incubator/openmeetings/trunk/singlewebapp/test/tt.bat Sun Jan 29 11:44:30
2012
@@ -0,0 +1,3 @@
+java -cp
C:\work\openmeetings\jodconverter-core-3.0-beta-4-dist\jodconverter-core-3.0-beta-4\libcommons-cli-1.1.jar
-cp
C:\work\openmeetings\jodconverter-core-3.0-beta-4-dist\jodconverter-core-3.0-beta-4\libcommons-io-1.4.jar
-cp
C:\work\openmeetings\jodconverter-core-3.0-beta-4-dist\jodconverter-core-3.0-beta-4\libjodconverter-core-3.0-beta-4.jar
-cp
C:\work\openmeetings\jodconverter-core-3.0-beta-4-dist\jodconverter-core-3.0-beta-4\libjson-20090211.jar
-cp
C:\work\openmeetings\jodconverter-core-3.0-beta-4-dist\jodconverter-core-3.0-beta-4\libjuh-3.2.1.jar
-cp
C:\work\openmeetings\jodconverter-core-3.0-beta-4-dist\jodconverter-core-3.0-beta-4\libjurt-3.2.1.jar
-cp
C:\work\openmeetings\jodconverter-core-3.0-beta-4-dist\jodconverter-core-3.0-beta-4\libridl-3.2.1.jar
-cp
C:\work\openmeetings\jodconverter-core-3.0-beta-4-dist\jodconverter-core-3.0-beta-4\libunoil-3.2.1.jar
-jar
C:/work/openmeetings/jodconverter-core-3.0-beta-4-dist/jodconverter-core-3.0-beta-4/lib/jodconverter-
core-3.0-beta-4.jar
C:\Users\swagner\workspaces\indigo_asf_2\ROOT\dist\red5\webapps\openmeetings\uploadtemp\files\4b6c9b20a4161b8729a7c2f72a900bd9.odt
C:\Users\swagner\workspaces\indigo_asf_2\ROOT\dist\red5\webapps\openmeetings\upload\files\4b6c9b20a4161b8729a7c2f72a900bd9\4b6c9b20a4161b8729a7c2f72a900bd9.pdf
+
+pause
\ No newline at end of file
