Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/stylesheets/errortable.xsl URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/stylesheets/errortable.xsl?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/stylesheets/errortable.xsl (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/stylesheets/errortable.xsl Tue Nov 3 22:25:34 2015 @@ -13,10 +13,11 @@ limitations under the License. --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"> + <xsl:param name="languagesDir"/> <xsl:output method="xml"/> <xsl:template match="ROOT"> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> +<document> <xsl:comment> Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -32,7 +33,7 @@ </xsl:comment> <properties> <title>Openmeetings Errors table</title> - <author email="[email protected]">Apache OpenMeetings Documentation Robot</author> + <author email="[email protected]">Apache OpenMeetings Documentation Robot</author> </properties> <body> <section name="Openmeetings Errors table"> @@ -50,22 +51,17 @@ </xsl:template> <xsl:template match="row"> + <xsl:variable name="englishPath"><xsl:value-of select="concat($languagesDir, '/Application.properties.xml')"/></xsl:variable> <tr> <td>-<xsl:value-of select="field[@name='errorvalues_id']"/></td> <td> - <xsl:variable name="typeId" select="field[@name='errortype_id']"/> - <xsl:variable name="x"> - <xsl:choose> - <xsl:when test="$typeId='1'">322</xsl:when> - <xsl:otherwise>323</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:value-of select="document('../../src/web/java/org/apache/openmeetings/web/app/Application.properties.xml')/properties/entry[@key=$x]/text()" /> + <xsl:variable name="type" select="field[@name='type']"/> + <xsl:value-of select="document($englishPath)/properties/entry[@key=error.type.$type]/text()" /> </td> <td> <xsl:variable name="descId" select="field[@name='fieldvalues_id']"/> - <xsl:value-of select="document('../../src/web/java/org/apache/openmeetings/web/app/Application.properties.xml')/properties/entry[@key=$descId]/text()" /> + <xsl:value-of select="document($englishPath)/properties/entry[@key=$descId]/text()" /> </td> </tr> </xsl:template> -</xsl:stylesheet> \ No newline at end of file +</xsl:stylesheet>
Added: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/BuildInstructions_3.0.x.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/BuildInstructions_3.0.x.xml?rev=1712427&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/BuildInstructions_3.0.x.xml (added) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/BuildInstructions_3.0.x.xml Tue Nov 3 22:25:34 2015 @@ -0,0 +1,305 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> + + <properties> + <title>Build instructions version 3.0.x</title> + <author email="[email protected]">OpenMeetings Team</author> + </properties> + + <body> + <section name="Nightly Builds"> + <p> + You can find Nightly Builds of the software at: + <a href="https://builds.apache.org/view/M-R/view/OpenMeetings/"; rel="nofollow" target="_blank"> + https://builds.apache.org/view/M-R/view/OpenMeetings/ + </a> + </p> + </section> + + <section name="These instructions are for 3.0.x version only"/> + + <section name="How to Build a Distribution"> + <div> + <p>To build a binary release of OpenMeetings you need: </p> + <ul> + <li>Oracle JDK7</li> + <li>Apache ANT (minimum) 1.8.3</li> + <li> + SVN Command line client (Subversion 1.7 required!) + <a href="http://subversion.apache.org/packages.html"; target="_blank" rel="nofollow">http://subversion.apache.org/packages.html</a> + </li> + </ul> + </div> + + <p>Get the source: </p> + <source><![CDATA[svn checkout https://svn.apache.org/repos/asf/openmeetings/branches/3.0.x/]]></source> + <p>Run the command: </p> + <source><![CDATA[ant ]]></source> + <p>There is no need to compile the client additionally! The ant task + does it all! You will find a directory dist that contains + OpenMeetings and a red5-server. + </p> + <p>To compile the client you can also use ant: </p> + <source> +<![CDATA[ +ant # compiles a complete package into the folder dist +ant compile.laszlo.main # compiles the client into main.as3.swf10.swf and main.swf8.swf +ant compile.laszlo.main.debug # compiles the debug-client into maindebug.as3.swf10.swf and maindebug.swf8.swf +ant -Ddb=<name of DB> # will copy <name of DB>_persistense.xml to persistense.xml + #(for ex. ant -Ddb=mysql will set mysql as default DB) +]]> + </source> + <p>To compile just the openmeetings JAR file: </p> + <source><![CDATA[ant jar.only]]></source> + <p> + To run Junit tests using ANT see + <a href="JUnitTesting.html">JUnitTesting</a> + </p> + </section> + + <section name="Run, Develop, Test"> + + <p> + To develop or build OpenMeetings you checkout the source as Eclipse + project. You need the Subclipse or Subversive Plugin for Eclipse. If + you just need to change 3 lines of code then your probably better + switch to + <a href="#How_to_build_a_distribution" rel="nofollow">How to build a + distribution + </a> + . + </p> + + <subsection name="Step1 - Get required Software"> + + <p>To develop OpenMeetings you need at least: </p> + <ul> + <li>Eclipse in a up to date copy and Oracle JDK7 </li> + <li>Apache ANT (minimum) 1.8.3</li> + <li> + Subclipse 1.8 (Subversion 1.7 required!) + <a href="http://subclipse.tigris.org/"; target="_blank" rel="nofollow">http://subclipse.tigris.org/ + </a> + </li> + <li> + SVN Command line client (Subversion 1.7 required!) + <a href="http://subversion.apache.org/packages.html"; target="_blank" + rel="nofollow">http://subversion.apache.org/packages.html</a> + </li> + <li>Spring IDE for Eclipse (installable via Help > Eclipse + Marketplace) + </li> + <li> + Apache IvyDE™ For Eclipse (installable via Help > Install + New Software) + URL: http://www.apache.org/dist/ant/ivyde/updatesite + detailed steps can be found here: + <a href="http://ant.apache.org/ivy/ivyde/download.cgi"; target="_blank" + rel="nofollow">http://ant.apache.org/ivy/ivyde/download.cgi</a> + </li> + <li>MySQL (or Postgres, or other Databases supported by openJPA) + are optionally but handy to have them + </li> + </ul> + + </subsection> + + <subsection name="Step2 - Download the Source"> + + <p>Advanced Users: Check out the Code from the Repository as a + Java + project into Eclipse. + </p> + <p> + URL: + <a href="https://svn.apache.org/repos/asf/openmeetings/branches/3.0.x/";> + https://svn.apache.org/repos/asf/openmeetings/branches/3.0.x/ + </a> + </p> + <p>To download the required JARs for building and developing + OpenMeetings you need to run the ANT comand: + </p> + <source><![CDATA[ant -Ddb=<your_DB> dist prepare-eclipse]]></source> + <p>After the ANT command you need to press F5 and rebuild the + project from inside Eclipse + </p> + <p>Step-By-Step: </p> + <p>1) Start Eclipse </p> + <p> + 2) Change Perspective to SVN Repository Exploring: + <br /> + <br /> + <a class="fancybox-buttons" href="images/checkout_1.png"> + <img src="images/checkout_1.png" alt="" width="400" height="289" /> + </a> + + </p> + <p> + 3) Select SVN Repository Exploring and click ok. + <br /> + <br /> + <a class="fancybox-buttons" href="images/checkout_2.png"> + <img src="images/checkout_2.png" alt="" width="304" height="417" /> + </a> + </p> + <p> + 4) A new Dialog in Eclipse opens + <strong>SVN Repositories</strong> + <br /> + <br /> + <a class="fancybox-buttons" href="images/checkout_3.png"> + <img src="images/checkout_3.png" alt="" width="460" height="102" /> + </a> + </p> + <p> + 5) Click on the icon with the plus in the top right corner in the + SVN Repository Dialog + <br /> + <br /> + <a class="fancybox-buttons" href="images/checkout_4.png"> + <img src="images/checkout_4.png" alt="" width="57" height="38" /> + </a> + </p> + <p> + 6) Add the URL + <a href="https://svn.apache.org/repos/asf/openmeetings/branches/3.0.x/"; rel="nofollow"> + https://svn.apache.org/repos/asf/openmeetings/branches/3.0.x/ + </a> + and click Finish + <br /> + <br /> + <a class="fancybox-buttons" href="images/checkout_5.png"> + <img src="images/checkout_5.png" alt="" width="455" height="272" /> + </a> + </p> + <p> + 7) After download is complete you see a new Source Repository in + the Repository Explorer. Right click on it and choose + <strong>checkout</strong> + <br /> + <br /> + <a class="fancybox-buttons" href="images/checkout_6.png"> + <img src="images/checkout_6.png" alt="" width="340" height="135" /> + </a> + </p> + <p> + 8) In the Dialog the opens now just click next + <br /> + <br /> + <a class="fancybox-buttons" href="images/checkout_7.png"> + <img src="images/checkout_7.png" alt="" width="390" height="338" /> + </a> + </p> + <p> + 9) In the next Dialog just click Finish, Eclipse will then download + the sources + <br /> + <br /> + <a class="fancybox-buttons" href="images/checkout_8.png"> + <img src="images/checkout_8.png" alt="" width="390" height="338" /> + </a> + </p> + <p> + 10) After the download is complete you will see a new Project in + the Package Explorer Dialog of Eclipse + <br /> + <br /> + <a class="fancybox-buttons" href="images/checkout_9.png"> + <img src="images/checkout_9.png" alt="" width="310" height="297" /> + </a> + </p> + <div> + 11) Please run + <source><![CDATA[ant dist prepare-eclipse]]></source> + to download all necessary jar files, and perform source + <tt>Refresh</tt> + to resolve all compilation issues. + </div> + </subsection> + + <subsection name="Step3 - Deploy and Run"> + + <p> + see the first chapter about the ANT tasks to compile the code. You + will find a directory called + <strong>dist</strong> + which contains a regular openmeetings including red5. You can then + use the usual process like described at + <a href="installation.html">installation</a> + to run the code then. + </p> + </subsection> + + </section> + + <section name="Links"> + + <ul> + <li> + Getting Started with OpenLaszlo, checkout + <a + href="http://www.openlaszlo.org/demos#Laszlo10"; + target="_blank" rel="nofollow">Laszlo-in-10-Minutes</a> + and the + <a href="http://www.openlaszlo.org/taxonomy/term/14"; target="_blank" + rel="nofollow">Application Developer's Guide</a> + or try the + <a href="http://www.openlaszlo.org/getstarted"; target="_blank" + rel="nofollow">ScreenCast</a> + </li> + <li> + <a href="http://openmeetings.apache.org/source-repository.html";> + browse SVN source + </a> + </li> + </ul> + + </section> + + <section name="Tips and Gotchas"> + + <p>When you want to develop only client side there are handy ANT + tasks so that you only rebuild the SWFs, same for the Java side. + </p> + <p> + It + also takes much less time if you do use MySQL as database then + rebuilding the software and waiting for Apache Derby to set up the + database everytime you did rebuild. + </p> + <p> + <b>Working behind a proxy:</b> + If you are sitting behind a proxy you should add some proxy settings + before starting the build process. + <br /> + For Apache Ivy see: + <a href="http://ant.apache.org/ivy/faq.html"; target="_blank" rel="nofollow">http://ant.apache.org/ivy/faq.html + </a> + <br /> + For SVN Command Line Client (From CollabNet 1.7) see: + <a + href="https://ctf6latest.collab.net/internal-help/index.jsp?topic=/teamforge610/faq/client_proxy_settings.html"; + target="_blank" rel="nofollow">https://ctf6latest.collab.net/internal-help/index.jsp?topic=/teamforge610/faq/client_proxy_settings.html + </a> + </p> + + </section> + + </body> + +</document> \ No newline at end of file Added: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CallForLogo.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CallForLogo.xml?rev=1712427&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CallForLogo.xml (added) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CallForLogo.xml Tue Nov 3 22:25:34 2015 @@ -0,0 +1,203 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> + <properties> + <title>Call For Logo</title> + <author email="[email protected]">OpenMeetings Team</author> + </properties> + <body> + <section name="OpenMeetings Call For Logo"> + <p> + As you may know, Apache Openmeetings is part of the Apache Software Foundation, which is a non-profit organization. + In order to celebrate The Apache Software Foundation's 15th Anniversary and promote the ASF's more than 200 projects, + Apache has launched an effort to get folks who use Apache projects to note that by including one or more of the newly-designed + "Powered By Apache" logos on their websites, documentation, marketing materials, etc.<br/><br/> + + Guidelines for use are available here: <a href="http://apache.org/foundation/press/kit/";>http://apache.org/foundation/press/kit</a><br/><br/> + + Unfortunately we have no suitable logo for this :(<br/><br/> + + This page is designed to test all proposed logo and choose the best one + </p> + </section> + <section name="Preview"> + <div class="powered-preview"> + </div> + </section> + <section name="Logos"> + <script type="text/javascript"> + //<![CDATA[ + function applyLogoBig(e) { + var ib = e.closest('table').find('.logo-big'); + var bi = $('#bannerLeft img'); + bi.attr('src', ib.attr('src')); + bi[0].scrollIntoView(); + } + function applyLogoSmall(e) { + var pp = $('.powered-preview'); + var l = pp.children('.powered-preview-logo'); + if (!l.length) { + l = $("<div class='powered-preview-logo'></div>"); + pp.append(l); + } + var ib = e.closest('table').find('.logo-square'); + l.css('background-image', 'url(' + ib.attr('src') + ')'); + l[0].scrollIntoView(); + } + //]]> + </script> + <h3>Big version</h3> + <ol> + <li> + <table> + <tr> + <td><img class="logo-big" src="images/logo-2.jpg" alt="Apache OpenMeetings"/></td> + <td><button class="btn btn-primary" onclick="applyLogoBig($(this));"/>Apply</td> + </tr> + <tr> + <td>Author</td> + <td>Denis Kandrov</td> + </tr> + </table> + </li> + <li> + <table> + <tr> + <td><img class="logo-big" src="images/logos/logo_om_big2.png" alt="Apache OpenMeetings"/></td> + <td><button class="btn btn-primary" onclick="applyLogoBig($(this));"/>Apply</td> + </tr> + <tr> + <td>Author</td> + <td>Alvaro Bustos</td> + </tr> + </table> + </li> + <li> + <table> + <tr> + <td><img class="logo-big" src="images/logos/logo_om_big3.png" alt="Apache OpenMeetings"/></td> + <td><button class="btn btn-primary" onclick="applyLogoBig($(this));"/>Apply</td> + </tr> + <tr> + <td>Author</td> + <td>Vital Trizna</td> + </tr> + </table> + </li> + <li> + <table> + <tr> + <td><img class="logo-big" src="images/logos/logo_om_big4.png" alt="Apache OpenMeetings"/></td> + <td><button class="btn btn-primary" onclick="applyLogoBig($(this));"/>Apply</td> + </tr> + <tr> + <td>Author</td> + <td>Vital Trizna</td> + </tr> + </table> + </li> + <li> + <table> + <tr> + <td><img class="logo-big" src="images/logos/logo_om_big5.png" alt="Apache OpenMeetings"/></td> + <td><button class="btn btn-primary" onclick="applyLogoBig($(this));"/>Apply</td> + </tr> + <tr> + <td>Author</td> + <td>Vital Trizna</td> + </tr> + </table> + </li> + <li> + <table> + <tr> + <td><img class="logo-big" src="images/logos/logo_om_big6.png" alt="Apache OpenMeetings"/></td> + <td><button class="btn btn-primary" onclick="applyLogoBig($(this));"/>Apply</td> + </tr> + <tr> + <td>Author</td> + <td>Alvaro Bustos</td> + </tr> + </table> + </li> + </ol> + <h3>Square version</h3> + <ol> + <li> + <table> + <tr> + <td><img class="logo-square" src="images/logos/logo_om1.png" alt="Square version" width="50"/></td> + <td><button class="btn btn-primary" onclick="applyLogoSmall($(this));"/>Apply</td> + </tr> + <tr> + <td>Author</td> + <td>Denis Kandrov</td> + </tr> + </table> + </li> + <li> + <table> + <tr> + <td><img class="logo-square" src="images/logos/logo_om_small2.png" alt="Square version" width="50"/></td> + <td><button class="btn btn-primary" onclick="applyLogoSmall($(this));"/>Apply</td> + </tr> + <tr> + <td>Author</td> + <td>Alvaro Bustos</td> + </tr> + </table> + </li> + <li> + <table> + <tr> + <td><img class="logo-square" src="images/logos/logo_om_small3.png" alt="Square version" width="50"/></td> + <td><button class="btn btn-primary" onclick="applyLogoSmall($(this));"/>Apply</td> + </tr> + <tr> + <td>Author</td> + <td>Vital Trizna</td> + </tr> + </table> + </li> + <li> + <table> + <tr> + <td><img class="logo-square" src="images/logos/logo_om_small4.png" alt="Square version" width="50"/></td> + <td><button class="btn btn-primary" onclick="applyLogoSmall($(this));"/>Apply</td> + </tr> + <tr> + <td>Author</td> + <td>Vital Trizna</td> + </tr> + </table> + </li> + <li> + <table> + <tr> + <td><img class="logo-square" src="images/logos/logo_om_small5.png" alt="Square version" width="50"/></td> + <td><button class="btn btn-primary" onclick="applyLogoSmall($(this));"/>Apply</td> + </tr> + <tr> + <td>Author</td> + <td>Alvaro Bustos</td> + </tr> + </table> + </li> + </ol> + </section> + </body> +</document> Added: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/NetworkCalculator.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/NetworkCalculator.xml?rev=1712427&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/NetworkCalculator.xml (added) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/NetworkCalculator.xml Tue Nov 3 22:25:34 2015 @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> +<document xmlns="http://maven.apache.org/XDOC/2.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> + <properties> + <title>Network bandwidth calculator for OpenMeetings</title> + <author email="[email protected]">OpenMeetings Team</author> + </properties> + + <head> + <script type="text/javascript" src="js/jquery-ui.min.js"></script> + <script type="text/javascript" src="js/netcalc.js"></script> + <link rel="stylesheet" href="css/jquery-ui.css"/> + <link rel="stylesheet" href="css/netcalc.css"/> + </head> + <body> + <section name="Network bandwidth for OpenMeetings"> + + <div id="content"> + <span class="result-area"> + Server inbound bandwidth: + <input name="bandwidth" type="text" id="sib" disabled="disabled" /> + kbit/s + <br /> + Server outbound bandwidth: + <br /> + <input name="bandwidth" type="text" id="sob" disabled="disabled" /> + kbit/s + <br /> + Participant inbound bandwidth: + <br /> + <input name="bandwidth" type="text" id="uib" disabled="disabled" /> + kbit/s + <br /> + Participant outbound bandwidth: + <br /> + <input name="bandwidth" type="text" id="uob" disabled="disabled" /> + kbit/s + </span> + + <span id="sliders-area"> + <span id="slider-cam-res"></span> + <input name="one" style="width: 400px;" type="text" id="amount_cam_res" value="" disabled="disabled" /> + <input name="onea" type="text" id="cam_res" value="" disabled="disabled" /> + + <span id="slider-num-with-cam"></span> + <input name="two" style="width: 400px;" type="text" id="amount_pwv" value="" disabled="disabled" /> + <input name="twoa" type="text" id="pwv" value="" disabled="disabled" /> + + <span id="slider-num-without-cam"></span> + <input name="three" style="width: 400px;" type="text" id="amount_pnv" value="" disabled="disabled" /> + <input name="threea" type="text" id="pnv" value="" disabled="disabled" /> + + <span> + <strong>Note:</strong> + This is calculation with default parameters:<br/> + Video codec: h263<br/> + Audio codec: Nellymoser<br/> + And without screen sharing. + </span> + </span> + </div> + </section> + </body> +</document> Propchange: openmeetings/branches/3.1.x/openmeetings-service/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Nov 3 22:25:34 2015 @@ -0,0 +1,5 @@ +target +.project +.classpath +.settings + Added: openmeetings/branches/3.1.x/openmeetings-service/pom.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/pom.xml?rev=1712427&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/pom.xml (added) +++ openmeetings/branches/3.1.x/openmeetings-service/pom.xml Tue Nov 3 22:25:34 2015 @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.openmeetings</groupId> + <artifactId>openmeetings-parent</artifactId> + <version>3.1.0-SNAPSHOT</version> + <relativePath>..</relativePath> + </parent> + <artifactId>openmeetings-service</artifactId> + <packaging>jar</packaging> + <name>Openmeetings Service</name> + <description>TODO</description> + <properties> + <site.basedir>${project.parent.basedir}</site.basedir> + <skip.site.copy>false</skip.site.copy> + </properties> + <dependencies> + <dependency> + <groupId>org.apache.openmeetings</groupId> + <artifactId>openmeetings-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-core</artifactId> + <version>${wicket.version}</version> + </dependency> + </dependencies> +</project> Copied: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java (from r1711723, openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java?p2=openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java&p1=openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java&r1=1711723&r2=1712427&rev=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java Tue Nov 3 22:25:34 2015 @@ -16,11 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.data.calendar.management; +package org.apache.openmeetings.service.calendar; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_BASE_URL; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPOINTMENT_REMINDER_MINUTES; import static org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_BASE_URL; +import static org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_MINUTES_REMINDER_SEND; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import java.util.ArrayList; @@ -29,14 +30,13 @@ import java.util.Date; import java.util.List; import java.util.TimeZone; -import org.apache.openmeetings.data.conference.InvitationManager; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao; import org.apache.openmeetings.db.dao.calendar.AppointmentDao; import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao; -import org.apache.openmeetings.db.dao.calendar.IInvitationManager.MessageType; import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao; import org.apache.openmeetings.db.dao.label.LabelDao; +import org.apache.openmeetings.db.dao.room.IInvitationManager; import org.apache.openmeetings.db.dao.room.InvitationDao; import org.apache.openmeetings.db.dao.room.RoomDao; import org.apache.openmeetings.db.dao.room.RoomTypeDao; @@ -44,10 +44,11 @@ import org.apache.openmeetings.db.dao.us import org.apache.openmeetings.db.entity.calendar.Appointment; import org.apache.openmeetings.db.entity.calendar.MeetingMember; import org.apache.openmeetings.db.entity.room.Invitation; +import org.apache.openmeetings.db.entity.room.Invitation.MessageType; import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.util.TimezoneUtil; -import org.apache.openmeetings.web.mail.template.AppointmentReminderTemplate; +import org.apache.openmeetings.service.mail.template.AppointmentReminderTemplate; import org.apache.wicket.util.string.Strings; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; @@ -69,7 +70,9 @@ public class AppointmentLogic { @Autowired private RoomDao roomDao; @Autowired - private InvitationManager invitationManager; + private RoomTypeDao roomTypeDao; + @Autowired + private IInvitationManager invitationManager; @Autowired private TimezoneUtil timezoneUtil; @Autowired @@ -78,44 +81,6 @@ public class AppointmentLogic { private UserDao userDao; @Autowired private MeetingMemberDao meetingMemberDao; - @Autowired - private RoomTypeDao roomTypeDao; - - private static int DEFAULT_MINUTES_REMINDER_SEND = 15; - - public List<Appointment> getTodaysAppointmentsForUser(Long userId) { - try { - log.debug("getTodaysAppointmentsForUser"); - List<Appointment> points = appointmentDao.getTodaysAppointmentsbyRangeAndMember(userId); - log.debug("Count Appointments for Today : " + points.size()); - return points; - } catch (Exception err) { - log.error("[getTodaysAppointmentsForUser]", err); - } - return null; - } - - /** - * @author o.becherer - * @param room_id - * @return - */ - // -------------------------------------------------------------------------------------------- - public Appointment getAppointmentByRoom(Long room_id) throws Exception { - log.debug("getAppointmentByRoom"); - - Room room = roomDao.get(room_id); - - if (room == null) { - throw new Exception("Room does not exist in database!"); - } - - if (!room.getAppointment()) { - throw new Exception("Room " + room.getName() + " isnt part of an appointed meeting"); - } - - return appointmentDao.getAppointmentByRoom(room_id); - } // -------------------------------------------------------------------------------------------- Copied: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java (from r1711723, openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/data/user/EmailManager.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java?p2=openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java&p1=openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/data/user/EmailManager.java&r1=1711723&r2=1712427&rev=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/data/user/EmailManager.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java Tue Nov 3 22:25:34 2015 @@ -16,16 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.data.user; +package org.apache.openmeetings.service.mail; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG_KEY; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName; +import org.apache.openmeetings.IApplication; +import org.apache.openmeetings.core.mail.MailHandler; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; -import org.apache.openmeetings.mail.MailHandler; -import org.apache.openmeetings.web.app.Application; -import org.apache.openmeetings.web.mail.template.FeedbackTemplate; -import org.apache.openmeetings.web.mail.template.RegisterUserTemplate; +import org.apache.openmeetings.service.mail.template.FeedbackTemplate; +import org.apache.openmeetings.service.mail.template.RegisterUserTemplate; +import org.apache.wicket.Application; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -42,6 +44,10 @@ public class EmailManager { @Autowired private MailHandler mailHandler; + public static String getString(long id) { + return ((IApplication)Application.get(wicketApplicationName)).getOmString(id); + } + /** * sends a mail adress to the user with his account data * @@ -58,7 +64,7 @@ public class EmailManager { if (sendEmailAtRegister == 1) { RegisterUserTemplate.ensureApplication(langId != null ? langId : configurationDao.getConfValue(CONFIG_DEFAULT_LANG_KEY, Long.class, "1")); - mailHandler.send(email, Application.getString(512) + mailHandler.send(email, getString(512) , RegisterUserTemplate.getEmail(username, userpass, email, sendEmailWithVerficationCode ? link : null)); } return "success"; @@ -66,7 +72,7 @@ public class EmailManager { //FIXME, seems to be not used public void sendFeedback(String username, String email, String message) { - mailHandler.send("[email protected]", Application.getString(499), FeedbackTemplate.getEmail(username, email, message)); + mailHandler.send("[email protected]", getString(499), FeedbackTemplate.getEmail(username, email, message)); } public String addEmailCon(String EMail, int CONTACT_ID) { Modified: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java Tue Nov 3 22:25:34 2015 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.web.mail.template; +package org.apache.openmeetings.service.mail.template; import java.util.TimeZone; Modified: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java Tue Nov 3 22:25:34 2015 @@ -16,16 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.web.mail.template; +package org.apache.openmeetings.service.mail.template; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG_KEY; -import static org.apache.openmeetings.web.app.Application.getBean; +import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName; +import org.apache.openmeetings.IApplication; +import org.apache.openmeetings.IWebSession; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; import org.apache.openmeetings.db.dao.label.LabelDao; -import org.apache.openmeetings.web.app.Application; -import org.apache.openmeetings.web.app.WebSession; -import org.apache.openmeetings.web.util.FormatHelper; +import org.apache.openmeetings.db.util.FormatHelper; +import org.apache.wicket.Application; import org.apache.wicket.MarkupContainer; import org.apache.wicket.ThreadContext; import org.apache.wicket.behavior.AttributeAppender; @@ -35,6 +36,7 @@ import org.apache.wicket.markup.html.Web import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.mock.MockWebResponse; import org.apache.wicket.protocol.http.BufferedWebResponse; +import org.apache.wicket.protocol.http.WebSession; import org.apache.wicket.protocol.http.mock.MockHttpServletRequest; import org.apache.wicket.protocol.http.mock.MockHttpSession; import org.apache.wicket.protocol.http.servlet.ServletWebRequest; @@ -48,12 +50,28 @@ public abstract class AbstractTemplatePa private static final long serialVersionUID = 1L; protected long langId; + public static IApplication getApp() { + return (IApplication)Application.get(wicketApplicationName); + } + + public static <T> T getBean(Class<T> clazz) { + return getApp().getOmBean(clazz); + } + + public static IWebSession getOmSession() { + return (IWebSession)WebSession.get(); + } + public AbstractTemplatePanel(Long langId) { super(TemplatePage.COMP_ID); this.langId = langId == null ? getBean(ConfigurationDao.class).getConfValue(CONFIG_DEFAULT_LANG_KEY, Long.class, "1") : langId; add(new TransparentWebMarkupContainer("container").add(AttributeAppender.append("dir", FormatHelper.isRtlLanguage(LabelDao.languages.get(langId).toLanguageTag()) ? "rtl" : "ltr"))); } + public static String getString(long id, long languageId) { + return getApp().getOmString(id, languageId); + } + /** * Collects the html generated by the rendering of a page. * @@ -91,21 +109,22 @@ public abstract class AbstractTemplatePa } public static void ensureApplication(long langId) { - Application a = null; + IApplication a = null; if (Application.exists()) { - a = Application.get(); + a = (IApplication)Application.get(); } else { - a = (Application)Application.get(Application.getAppName()); - ThreadContext.setApplication(a); + Application app = Application.get(wicketApplicationName); + ThreadContext.setApplication(app); + a = (IApplication)Application.get(wicketApplicationName); } if (ThreadContext.getRequestCycle() == null) { - ServletWebRequest req = new ServletWebRequest(new MockHttpServletRequest(a, new MockHttpSession(a.getServletContext()), a.getServletContext()), ""); + ServletWebRequest req = new ServletWebRequest(new MockHttpServletRequest((Application)a, new MockHttpSession(a.getServletContext()), a.getServletContext()), ""); RequestCycleContext rctx = new RequestCycleContext(req, new MockWebResponse(), a.getRootRequestMapper(), a.getExceptionMapperProvider().get()); ThreadContext.setRequestCycle(new RequestCycle(rctx)); } if (ThreadContext.getSession() == null) { WebSession s = WebSession.get(); - s.setLanguage(langId); + ((IWebSession)s).setLanguage(langId); ThreadContext.setSession(s); } } Modified: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AppointmentReminderTemplate.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AppointmentReminderTemplate.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AppointmentReminderTemplate.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AppointmentReminderTemplate.java Tue Nov 3 22:25:34 2015 @@ -16,13 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.web.mail.template; +package org.apache.openmeetings.service.mail.template; import java.util.TimeZone; import org.apache.openmeetings.db.entity.calendar.Appointment; import org.apache.openmeetings.util.CalendarPatterns; -import org.apache.openmeetings.web.app.Application; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.util.string.Strings; @@ -33,16 +32,16 @@ public class AppointmentReminderTemplate private AppointmentReminderTemplate(Long langId, Appointment a, TimeZone tz) { super(langId, a, tz); - add(new Label("titleLbl", Application.getString(1158L, langId))); + add(new Label("titleLbl", getString(1158L, langId))); add(new Label("title", a.getTitle())); add(new WebMarkupContainer("descContainer") - .add(new Label("descLbl", Application.getString(1152L, langId))) + .add(new Label("descLbl", getString(1152L, langId))) .add(new Label("desc", a.getDescription()).setEscapeModelStrings(false)) .setVisible(!Strings.isEmpty(a.getDescription())) ); - add(new Label("startLbl", Application.getString(1153L, langId))); + add(new Label("startLbl", getString(1153L, langId))); add(new Label("start", CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz))); - add(new Label("endLbl", Application.getString(1154L, langId))); + add(new Label("endLbl", getString(1154L, langId))); add(new Label("end", CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz))); } @@ -54,7 +53,7 @@ public class AppointmentReminderTemplate @Override public String getSubject() { StringBuilder sb = new StringBuilder(); - sb.append(Application.getString(1158L, langId)).append(" ").append(" ").append(a.getTitle()).append(' ') + sb.append(getString(1158L, langId)).append(" ").append(" ").append(a.getTitle()).append(' ') .append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz)) .append(" - ").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz)); Modified: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java Tue Nov 3 22:25:34 2015 @@ -16,13 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.web.mail.template; +package org.apache.openmeetings.service.mail.template; import java.util.TimeZone; import org.apache.openmeetings.db.entity.calendar.Appointment; import org.apache.openmeetings.util.CalendarPatterns; -import org.apache.openmeetings.web.app.Application; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.util.string.Strings; @@ -33,18 +32,18 @@ public class CanceledAppointmentTemplate private CanceledAppointmentTemplate(Long langId, Appointment a, TimeZone tz, String invitorName) { super(langId, a, tz); - add(new Label("titleLbl", Application.getString(1157L, langId))); + add(new Label("titleLbl", getString(1157L, langId))); add(new Label("title", a.getTitle())); add(new WebMarkupContainer("descContainer") - .add(new Label("descLbl", Application.getString(1152L, langId))) + .add(new Label("descLbl", getString(1152L, langId))) .add(new Label("desc", a.getDescription()).setEscapeModelStrings(false)) .setVisible(!Strings.isEmpty(a.getDescription())) ); - add(new Label("startLbl", Application.getString(1153L, langId))); + add(new Label("startLbl", getString(1153L, langId))); add(new Label("start", CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz))); - add(new Label("endLbl", Application.getString(1154L, langId))); + add(new Label("endLbl", getString(1154L, langId))); add(new Label("end", CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz))); - add(new Label("invitorLbl", Application.getString(1156L, langId))); + add(new Label("invitorLbl", getString(1156L, langId))); add(new Label("invitor", invitorName)); } @@ -56,7 +55,7 @@ public class CanceledAppointmentTemplate @Override public String getSubject() { StringBuilder sb = new StringBuilder(); - sb.append(Application.getString(1157L, langId)).append(" ").append(a.getTitle()) + sb.append(getString(1157L, langId)).append(" ").append(a.getTitle()) .append(" ").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz)) .append(" - ").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz)); Modified: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java Tue Nov 3 22:25:34 2015 @@ -16,13 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.web.mail.template; +package org.apache.openmeetings.service.mail.template; import java.util.TimeZone; import org.apache.openmeetings.db.entity.calendar.Appointment; import org.apache.openmeetings.util.CalendarPatterns; -import org.apache.openmeetings.web.app.Application; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.util.string.Strings; @@ -33,18 +32,18 @@ public class CreatedAppointmentTemplate private CreatedAppointmentTemplate(Long langId, Appointment a, TimeZone tz, String invitorName) { super(langId, a, tz); - add(new Label("titleLbl", Application.getString(1151L, langId))); + add(new Label("titleLbl", getString(1151L, langId))); add(new Label("title", a.getTitle())); add(new WebMarkupContainer("descContainer") - .add(new Label("descLbl", Application.getString(1152L, langId))) + .add(new Label("descLbl", getString(1152L, langId))) .add(new Label("desc", a.getDescription()).setEscapeModelStrings(false)) .setVisible(!Strings.isEmpty(a.getDescription())) ); - add(new Label("startLbl", Application.getString(1153L, langId))); + add(new Label("startLbl", getString(1153L, langId))); add(new Label("start", CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz))); - add(new Label("endLbl", Application.getString(1154L, langId))); + add(new Label("endLbl", getString(1154L, langId))); add(new Label("end", CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz))); - add(new Label("invitorLbl", Application.getString(1156L, langId))); + add(new Label("invitorLbl", getString(1156L, langId))); add(new Label("invitor", invitorName)); } @@ -56,7 +55,7 @@ public class CreatedAppointmentTemplate @Override public String getSubject() { StringBuilder sb = new StringBuilder(); - sb.append(Application.getString(1151L, langId)).append(" ").append(a.getTitle()) + sb.append(getString(1151L, langId)).append(" ").append(a.getTitle()) .append(" ").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz)) .append(" - ").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz)); Modified: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.java Tue Nov 3 22:25:34 2015 @@ -16,12 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.web.mail.template; - -import static org.apache.openmeetings.web.app.Application.getBean; +package org.apache.openmeetings.service.mail.template; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; -import org.apache.openmeetings.web.app.WebSession; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.ExternalLink; @@ -29,7 +26,7 @@ public class FeedbackTemplate extends Ab private static final long serialVersionUID = 1L; public FeedbackTemplate(String username, String email, String message) { - super(WebSession.getLanguage()); + super(getOmSession().getOmLanguage()); add(new Label("appname", getBean(ConfigurationDao.class).getAppName())); add(new Label("username", username)); add(new Label("email", email)); Modified: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java Tue Nov 3 22:25:34 2015 @@ -16,9 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.web.mail.template; +package org.apache.openmeetings.service.mail.template; -import org.apache.openmeetings.web.app.Application; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.ExternalLink; @@ -29,16 +28,16 @@ public class InvitationTemplate extends private InvitationTemplate(Long langId, String invitorName, String message, String link) { super(langId); - add(new Label("titleLbl", Application.getString(500, langId))); - add(new Label("userLbl", Application.getString(501, langId))); + add(new Label("titleLbl", getString(500, langId))); + add(new Label("userLbl", getString(501, langId))); add(new Label("user", invitorName)); - add(new Label("messageLbl", Application.getString(502, langId))); + add(new Label("messageLbl", getString(502, langId))); add(new Label("message", message).setEscapeModelStrings(false)); add(new WebMarkupContainer("links") - .add(new Label("comment_for_link1", Application.getString(503, langId))) - .add(new ExternalLink("invitation_link1", link).add(new Label("clickMe", Application.getString(504, langId)))) - .add(new Label("comment_for_link2", Application.getString(505, langId))) + .add(new Label("comment_for_link1", getString(503, langId))) + .add(new ExternalLink("invitation_link1", link).add(new Label("clickMe", getString(504, langId)))) + .add(new Label("comment_for_link2", getString(505, langId))) .add(new Label("invitation_link2", link)) .setVisible(link != null) ); Modified: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java Tue Nov 3 22:25:34 2015 @@ -16,10 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.web.mail.template; +package org.apache.openmeetings.service.mail.template; -import org.apache.openmeetings.web.app.Application; -import org.apache.openmeetings.web.app.WebSession; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.ExternalLink; @@ -28,8 +26,8 @@ public class RegisterUserTemplate extend private static final long serialVersionUID = 1L; public RegisterUserTemplate(String username, String userpass, String email, String verification_url) { - super(WebSession.getLanguage()); - add(new Label("registrationLbl", Application.getString(506, langId))); + super(getOmSession().getOmLanguage()); + add(new Label("registrationLbl", getString(506, langId))); add(new Label("username", username)); add(new Label("userpass", userpass)); add(new Label("email", email)); @@ -37,7 +35,7 @@ public class RegisterUserTemplate extend add(verification.add(new Label("verification_url2", verification_url)) .add(new ExternalLink("verification_url1", verification_url)) .setVisible(verification_url != null)); - add(new Label("organisationLbl", Application.getString(511, langId))); + add(new Label("organisationLbl", getString(511, langId))); } public static String getEmail(String username, String userpass, String email, String verification_url) { Modified: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.java Tue Nov 3 22:25:34 2015 @@ -16,10 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.web.mail.template; +package org.apache.openmeetings.service.mail.template; import org.apache.openmeetings.db.entity.user.UserContact; -import org.apache.openmeetings.web.app.Application; import org.apache.wicket.markup.html.basic.Label; public class RequestContactConfirmTemplate extends AbstractTemplatePanel { @@ -27,12 +26,12 @@ public class RequestContactConfirmTempla public RequestContactConfirmTemplate(UserContact contact) { super(contact.getOwner().getLanguage_id()); - add(new Label("hi", Application.getString(1192, langId))); + add(new Label("hi", getString(1192, langId))); add(new Label("firstName", contact.getOwner().getFirstname())); add(new Label("lastName", contact.getOwner().getLastname())); add(new Label("addedFirstName", contact.getContact().getFirstname())); add(new Label("addedLastName", contact.getContact().getLastname())); - add(new Label("confirmed", Application.getString(1198, langId))); + add(new Label("confirmed", getString(1198, langId))); } public static String getEmail(UserContact contact) { Modified: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java Tue Nov 3 22:25:34 2015 @@ -16,11 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.web.mail.template; +package org.apache.openmeetings.service.mail.template; import org.apache.openmeetings.db.entity.user.User; -import org.apache.openmeetings.web.app.Application; -import org.apache.openmeetings.web.util.ContactsHelper; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.ExternalLink; @@ -29,14 +27,14 @@ public class RequestContactTemplate exte public RequestContactTemplate(User userToAdd, User user) { super(userToAdd.getLanguage_id()); - add(new Label("hi", Application.getString(1192, langId))); + add(new Label("hi", getString(1192, langId))); add(new Label("addedFirstName", userToAdd.getFirstname())); add(new Label("addedLastName", userToAdd.getLastname())); add(new Label("firstName", user.getFirstname())); add(new Label("lastName", user.getLastname())); - add(new Label("likeToAdd", Application.getString(1193, langId))); - add(new Label("check", Application.getString(1194, langId))); - add(new ExternalLink("link", ContactsHelper.getLink()).add(new Label("contactList", Application.getString(1196, langId)))); + add(new Label("likeToAdd", getString(1193, langId))); + add(new Label("check", getString(1194, langId))); + add(new ExternalLink("link", getApp().getOmContactsLink()).add(new Label("contactList", getString(1196, langId)))); } public static String getEmail(User userToAdd, User user) { Modified: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java Tue Nov 3 22:25:34 2015 @@ -16,9 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.web.mail.template; +package org.apache.openmeetings.service.mail.template; -import org.apache.openmeetings.web.app.WebSession; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.ExternalLink; @@ -26,7 +25,7 @@ public class ResetPasswordTemplate exten private static final long serialVersionUID = 1L; public ResetPasswordTemplate(String link) { - super(WebSession.getLanguage()); + super(getOmSession().getOmLanguage()); add(new ExternalLink("reset_link1", link)); add(new Label("reset_link2", link)); } Modified: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java Tue Nov 3 22:25:34 2015 @@ -16,13 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.web.mail.template; +package org.apache.openmeetings.service.mail.template; import java.util.TimeZone; import org.apache.openmeetings.db.entity.calendar.Appointment; import org.apache.openmeetings.util.CalendarPatterns; -import org.apache.openmeetings.web.app.Application; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.util.string.Strings; @@ -33,18 +32,18 @@ public class UpdatedAppointmentTemplate private UpdatedAppointmentTemplate(Long langId, Appointment a, TimeZone tz, String invitorName) { super(langId, a, tz); - add(new Label("titleLbl", Application.getString(1155L, langId))); + add(new Label("titleLbl", getString(1155L, langId))); add(new Label("title", a.getTitle())); add(new WebMarkupContainer("descContainer") - .add(new Label("descLbl", Application.getString(1152L, langId))) + .add(new Label("descLbl", getString(1152L, langId))) .add(new Label("desc", a.getDescription()).setEscapeModelStrings(false)) .setVisible(!Strings.isEmpty(a.getDescription())) ); - add(new Label("startLbl", Application.getString(1153L, langId))); + add(new Label("startLbl", getString(1153L, langId))); add(new Label("start", CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz))); - add(new Label("endLbl", Application.getString(1154L, langId))); + add(new Label("endLbl", getString(1154L, langId))); add(new Label("end", CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz))); - add(new Label("invitorLbl", Application.getString(1156L, langId))); + add(new Label("invitorLbl", getString(1156L, langId))); add(new Label("invitor", invitorName)); } @@ -56,7 +55,7 @@ public class UpdatedAppointmentTemplate @Override public String getSubject() { StringBuilder sb = new StringBuilder(); - sb.append(Application.getString(1155L, langId)).append(" ").append(a.getTitle()) + sb.append(getString(1155L, langId)).append(" ").append(a.getTitle()) .append(" ").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz)) .append(" - ").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz)); Modified: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/MeetingReminderJob.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/MeetingReminderJob.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/MeetingReminderJob.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/MeetingReminderJob.java Tue Nov 3 22:25:34 2015 @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.quartz.scheduler; +package org.apache.openmeetings.service.quartz.scheduler; -import org.apache.openmeetings.data.calendar.management.AppointmentLogic; +import org.apache.openmeetings.service.calendar.AppointmentLogic; import org.apache.openmeetings.util.OpenmeetingsVariables; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; Modified: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/SessionClearJob.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/SessionClearJob.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/SessionClearJob.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/SessionClearJob.java Tue Nov 3 22:25:34 2015 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.quartz.scheduler; +package org.apache.openmeetings.service.quartz.scheduler; import org.apache.openmeetings.db.dao.server.SessiondataDao; import org.apache.openmeetings.util.OpenmeetingsVariables; Modified: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/TestSetupCleanupJob.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/TestSetupCleanupJob.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/TestSetupCleanupJob.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/TestSetupCleanupJob.java Tue Nov 3 22:25:34 2015 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.quartz.scheduler; +package org.apache.openmeetings.service.quartz.scheduler; import java.io.File; import java.io.FileFilter; Copied: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java (from r1711723, openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java?p2=openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java&p1=openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java&r1=1711723&r2=1712427&rev=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java Tue Nov 3 22:25:34 2015 @@ -16,10 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.data.conference; +package org.apache.openmeetings.service.room; import static org.apache.openmeetings.util.CalendarHelper.getZoneId; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName; import java.security.NoSuchAlgorithmException; import java.util.Date; @@ -27,30 +28,32 @@ import java.util.HashMap; import java.util.TimeZone; import java.util.Vector; +import org.apache.openmeetings.IApplication; +import org.apache.openmeetings.core.mail.MailHandler; +import org.apache.openmeetings.core.mail.SMSHandler; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; -import org.apache.openmeetings.db.dao.calendar.IInvitationManager; +import org.apache.openmeetings.db.dao.room.IInvitationManager; import org.apache.openmeetings.db.dao.room.InvitationDao; import org.apache.openmeetings.db.entity.basic.MailMessage; import org.apache.openmeetings.db.entity.calendar.Appointment; import org.apache.openmeetings.db.entity.calendar.MeetingMember; import org.apache.openmeetings.db.entity.room.Invitation; +import org.apache.openmeetings.db.entity.room.Invitation.MessageType; import org.apache.openmeetings.db.entity.room.Invitation.Valid; import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.User.Type; import org.apache.openmeetings.db.util.TimezoneUtil; -import org.apache.openmeetings.mail.MailHandler; -import org.apache.openmeetings.mail.SMSHandler; +import org.apache.openmeetings.service.mail.template.AbstractAppointmentTemplate; +import org.apache.openmeetings.service.mail.template.CanceledAppointmentTemplate; +import org.apache.openmeetings.service.mail.template.CreatedAppointmentTemplate; +import org.apache.openmeetings.service.mail.template.InvitationTemplate; +import org.apache.openmeetings.service.mail.template.UpdatedAppointmentTemplate; import org.apache.openmeetings.util.CalendarHelper; -import org.apache.openmeetings.util.LinkHelper; import org.apache.openmeetings.util.crypt.MD5; import org.apache.openmeetings.util.crypt.ManageCryptStyle; import org.apache.openmeetings.util.mail.IcalHandler; -import org.apache.openmeetings.web.mail.template.AbstractAppointmentTemplate; -import org.apache.openmeetings.web.mail.template.CanceledAppointmentTemplate; -import org.apache.openmeetings.web.mail.template.CreatedAppointmentTemplate; -import org.apache.openmeetings.web.mail.template.InvitationTemplate; -import org.apache.openmeetings.web.mail.template.UpdatedAppointmentTemplate; +import org.apache.wicket.Application; import org.apache.wicket.util.string.Strings; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; @@ -109,7 +112,7 @@ public class InvitationManager implement } public void sendInvitionLink(Invitation i, MessageType type, String subject, String message, boolean ical) throws Exception { - String invitation_link = type == MessageType.Cancel ? null : LinkHelper.getInvitationLink(configDao.getBaseUrl(), i); + String invitation_link = type == MessageType.Cancel ? null : ((IApplication)Application.get(wicketApplicationName)).getOmInvitationLink(configDao.getBaseUrl(), i); User owner = i.getInvitedBy(); String invitorName = owner.getFirstname() + " " + owner.getLastname(); @@ -255,7 +258,6 @@ public class InvitationManager implement if (obj instanceof Invitation) { Invitation invitation = (Invitation) obj; - if (ManageCryptStyle.getInstanceOfCrypt().verifyPassword(pass, invitation.getPassword())) { return new Long(1); } else { Copied: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java (from r1711723, openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?p2=openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java&p1=openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java&r1=1711723&r2=1712427&rev=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java Tue Nov 3 22:25:34 2015 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.data.user; +package org.apache.openmeetings.service.user; import static org.apache.openmeetings.db.util.UserHelper.getMinLoginLength; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID; @@ -61,8 +61,9 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.db.entity.user.User.Type; import org.apache.openmeetings.db.entity.user.Userdata; import org.apache.openmeetings.db.util.TimezoneUtil; -import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter; -import org.apache.openmeetings.util.AuthLevelUtil; +import org.apache.openmeetings.service.mail.EmailManager; +import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter; +import org.apache.openmeetings.db.util.AuthLevelUtil; import org.apache.openmeetings.util.CalendarPatterns; import org.apache.openmeetings.util.DaoHelper; import org.apache.openmeetings.util.crypt.ManageCryptStyle; Added: openmeetings/branches/3.1.x/openmeetings-service/src/site/site.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/site/site.xml?rev=1712427&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/src/site/site.xml (added) +++ openmeetings/branches/3.1.x/openmeetings-service/src/site/site.xml Tue Nov 3 22:25:34 2015 @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> +<project xmlns="http://maven.apache.org/DECORATION/1.6.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"; + name="Apache OpenMeetings Project"> + + <body> + <menu ref="parent"/> + <menu name="Project"> + <item name="About" href="/index.html" /> + <item name="Info" href="/project-info.html" /> + <item name="Summary" href="/project-summary.html" /> + <item name="License" href="/license.html" /> + <item name="Dependencies" href="/dependencies.html" /> + <item name="Dependency Convergence" href="/dependency-convergence.html" /> + <item name="RAT Report" href="/rat-report.html" /> + <item name="JavaDoc" href="/apidocs/index.html" target="_blank" /> + </menu> + </body> +</project> Propchange: openmeetings/branches/3.1.x/openmeetings-util/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Nov 3 22:25:34 2015 @@ -0,0 +1,5 @@ +target +.project +.classpath +.settings + Added: openmeetings/branches/3.1.x/openmeetings-util/pom.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-util/pom.xml?rev=1712427&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-util/pom.xml (added) +++ openmeetings/branches/3.1.x/openmeetings-util/pom.xml Tue Nov 3 22:25:34 2015 @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.openmeetings</groupId> + <artifactId>openmeetings-parent</artifactId> + <version>3.1.0-SNAPSHOT</version> + <relativePath>..</relativePath> + </parent> + <artifactId>openmeetings-util</artifactId> + <packaging>jar</packaging> + <name>Openmeetings Util</name> + <description>TODO</description> + <properties> + <dom4j.version>1.6.1</dom4j.version> + <mail.version>1.4.7</mail.version> + <commons-codec.version>1.8</commons-codec.version> + <site.basedir>${project.parent.basedir}</site.basedir> + <skip.site.copy>false</skip.site.copy> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.red5</groupId> + <artifactId>red5-server</artifactId> + </dependency> + <dependency> + <groupId>commons-transaction</groupId> + <artifactId>commons-transaction</artifactId> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>${dom4j.version}</version> + </dependency> + <dependency> + <groupId>org.mnode.ical4j</groupId> + <artifactId>ical4j</artifactId> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>${mail.version}</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>${commons-codec.version}</version> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-util</artifactId> + <version>${wicket.version}</version> + </dependency> + <dependency> + <groupId>org.threeten</groupId> + <artifactId>threetenbp</artifactId> + <version>1.3.1</version> + </dependency> + </dependencies> +</project> Copied: openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/ConnectionProperties.java (from r1711723, openmeetings/branches/3.1.x/src/install/java/org/apache/openmeetings/cli/ConnectionProperties.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/ConnectionProperties.java?p2=openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/ConnectionProperties.java&p1=openmeetings/branches/3.1.x/src/install/java/org/apache/openmeetings/cli/ConnectionProperties.java&r1=1711723&r2=1712427&rev=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/src/install/java/org/apache/openmeetings/cli/ConnectionProperties.java (original) +++ openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/ConnectionProperties.java Tue Nov 3 22:25:34 2015 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.cli; +package org.apache.openmeetings.util; import java.io.Serializable; Copied: openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java (from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/OmFileHelper.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java?p2=openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java&p1=openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/OmFileHelper.java&r1=1711723&r2=1712427&rev=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/OmFileHelper.java (original) +++ openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java Tue Nov 3 22:25:34 2015 @@ -26,7 +26,7 @@ import java.io.OutputStream; import java.text.DecimalFormat; import org.apache.commons.transaction.util.FileHelper; -import org.apache.openmeetings.cli.ConnectionProperties.DbType; +import org.apache.openmeetings.util.ConnectionProperties.DbType; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; @@ -118,8 +118,8 @@ public class OmFileHelper { return getDir(getUploadProfilesDir(), profilesPrefix + userId); } - public static File getUploadProfilesUserDir(String users_id) { - return getDir(getUploadProfilesDir(), profilesPrefix + users_id); + public static File getUploadProfilesUserDir(String userId) { + return getDir(getUploadProfilesDir(), profilesPrefix + userId); } public static File getDefaultProfilePicture() { @@ -166,8 +166,8 @@ public class OmFileHelper { return getDir(getUploadTempDir(), PROFILES_DIR); } - public static File getUploadTempProfilesUserDir(Long users_id) { - return getDir(getUploadTempProfilesDir(), OmFileHelper.profilesPrefix + users_id); + public static File getUploadTempProfilesUserDir(Long userId) { + return getDir(getUploadTempProfilesDir(), OmFileHelper.profilesPrefix + userId); } public static File getUploadTempRoomDir(String roomName) { Copied: openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java (from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java?p2=openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java&p1=openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java&r1=1711723&r2=1712427&rev=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java (original) +++ openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java Tue Nov 3 22:25:34 2015 @@ -36,7 +36,10 @@ public class OpenmeetingsVariables { public static final String CONFIG_DEFAULT_LDAP_ID = "ldap_default_id"; public static final String CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY = "redirect.url.for.external.users"; public static final String CONFIG_APPOINTMENT_REMINDER_MINUTES = "number.minutes.reminder.send"; + public static final String CONFIG_APPLICATION_NAME = "application.name"; public static final String CONFIG_APPLICATION_BASE_URL = "application.base.url"; + public static final String CONFIG_FLASH_PROTOCOL = "flash.protocol"; + public static final String CONFIG_FLASH_PORT = "flash.port"; public static final String CONFIG_SCREENSHARING_QUALITY = "default.quality.screensharing"; public static final String CONFIG_SCREENSHARING_FPS = "default.fps.screensharing"; public static final String CONFIG_SCREENSHARING_FPS_SHOW = "screensharing.fps.show"; @@ -54,4 +57,5 @@ public class OpenmeetingsVariables { public static final int USER_LOGIN_MINIMUM_LENGTH = 4; public static final int USER_PASSWORD_MINIMUM_LENGTH = 4; public static Boolean whiteboardDrawStatus = null; + public static String wicketApplicationName = null; } Copied: openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java (from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/Version.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java?p2=openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java&p1=openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/Version.java&r1=1711723&r2=1712427&rev=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/Version.java (original) +++ openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java Tue Nov 3 22:25:34 2015 @@ -44,7 +44,7 @@ public class Version { try { version = getAttributes().getValue("Product-Version"); } catch (Exception e) { - e.printStackTrace(); + log.error("Error", e); } } return version; @@ -55,7 +55,7 @@ public class Version { try { revision = getAttributes().getValue("Svn-Revision"); } catch (Exception e) { - e.printStackTrace(); + log.error("Error", e); } } return revision; @@ -66,7 +66,7 @@ public class Version { try { buildDate = getAttributes().getValue("Built-On"); } catch (Exception e) { - e.printStackTrace(); + log.error("Error", e); } } return buildDate;
