prepare for pade 1.0

config/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.igniterealtime.openfire.ofmeet</groupId>
         <artifactId>parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
     </parent>
 
     <artifactId>config</artifactId>

offocus/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.igniterealtime.openfire.ofmeet</groupId>
         <artifactId>parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
     </parent>
 
     <artifactId>offocus</artifactId>

offocus/src/i18n/offocus_i18n.properties

@@ -41,7 +41,7 @@ global.csrf.failed=CSRF Error: No changes made, you'll need to retry.
 
 # OFMeet specific properties start here.
 plugin.title=Meetings
-plugin.description=Openfire Meetings
+plugin.description=Pade Focus Component
 ofmeet.back=Back
 
 network-settings.title=Network Settings
@@ -52,18 +52,18 @@ config.page.configuration.disabled=Disabled
 config.page.conference.title=Conference
 config.page.conference.description=Videobridge Conference Detail Page
 config.page.summary.title=Summary
-config.page.summary.description=Openfire Meetings Summary Page
+config.page.summary.description=Pade Focus Component Summary Page
 config.page.settings.title=Settings
-config.page.settings.description=Openfire Meetings Settings Page
+config.page.settings.description=Pade Focus Component Settings Page
 config.page.settings.introduction=Use the form below to change server-sided OFMeet settings.
 config.page.uisettings.title=User Interface
 config.page.uisettings.description=User Interface Configuration Page
 config.page.uisettings.introduction=Use the form below to change the user interface of the web client.
 config.page.calendar.title=Meeting Room Calendar
-config.page.calendar.description=Openfire Meetings Room Calendar Page
+config.page.calendar.description=Pade Focus Component Room Calendar Page
 config.page.planner.title=Planner
-config.page.planner.description=Openfire Meetings Planner Page
-config.page.email.listener.description=Openfire Meetings Email Listener Page
+config.page.planner.description=Pade Focus Component Planner Page
+config.page.email.listener.description=Pade Focus Component Email Listener Page
 config.page.email.listener.title=Email Listener
 config.page.configuration.media.title=Media Configuration
 config.page.configuration.ui.title=User Interface Configuration

ofgasi/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.igniterealtime.openfire.ofmeet</groupId>
         <artifactId>parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
     </parent>
 
     <artifactId>ofgasi</artifactId>

ofmeet/classes/jitsi-meet/custom_ofmeet.js

@@ -155,7 +155,7 @@ var ofmeet = (function(of)
 
     function setup()
     {
-        if (!APP.connection || !APP.conference)
+        if (!APP.connection || !APP.conference || !APP.conference.isJoined())
         {
             setTimeout(setup, 100);
             return;
@@ -165,11 +165,6 @@ var ofmeet = (function(of)
         {
             listenWebPushEvents();
 
-            APP.conference.addConferenceListener(JitsiMeetJS.events.conference.CONFERENCE_JOINED, function()
-            {
-                console.debug("ofmeet.js me joined");
-            });
-
             APP.conference.addConferenceListener(JitsiMeetJS.events.conference.CONFERENCE_LEFT, function()
             {
                 console.debug("ofmeet.js me left");

ofmeet/classes/jitsi-meet/index.html

@@ -155,6 +155,7 @@
     </script>
     <template id="welcome-page-additional-content-template"></template>
     <template id="settings-toolbar-additional-content-template"></template>
+
     <script src="config.js"></script>
     <script src="libs/do_external_connect.min.js"></script>
     <script src="interface_config.js"></script>

ofmeet/classes/jitsi-meet/manifest_ofmeet.json

@@ -1,6 +1,6 @@
 {
-    "short_name": "Openfire Meetings",
-    "name": "Openfire Meetings",
+    "short_name": "Pade Meetings",
+    "name": "Pade Meetings",
     "description": "High quality, secured and scalable video conferences with Jitsi and Openfire",    
     "icons": [
         {

ofmeet/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.igniterealtime.openfire.ofmeet</groupId>
         <artifactId>parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
     </parent>
 
     <artifactId>ofmeet</artifactId>

ofmeet/src/i18n/ofmeet_i18n.properties

@@ -41,7 +41,7 @@ global.csrf.failed=CSRF Error: No changes made, you'll need to retry.
 
 # OFMeet specific properties start here.
 plugin.title=Meetings
-plugin.description=Openfire Meetings
+plugin.description=Pade Meetings
 ofmeet.back=Back
 
 network-settings.title=Network Settings
@@ -52,19 +52,19 @@ config.page.configuration.disabled=Disabled
 config.page.conference.title=Conference
 config.page.conference.description=Videobridge Conference Detail Page
 config.page.summary.title=Summary
-config.page.summary.description=Openfire Meetings Summary Page
+config.page.summary.description=Pade Meetings Summary Page
 config.page.settings.title=Settings
-config.page.settings.description=Openfire Meetings Settings Page
+config.page.settings.description=Pade Meetings Settings Page
 config.page.settings.introduction=Use the form below to change server-sided OFMeet settings.
 config.page.applications.title=Applications/Tools
 config.page.uisettings.title=User Interface
 config.page.uisettings.description=User Interface Configuration Page
 config.page.uisettings.introduction=Use the form below to change the user interface of the web client.
 config.page.calendar.title=Meeting Room Calendar
-config.page.calendar.description=Openfire Meetings Room Calendar Page
+config.page.calendar.description=Pade Meetings Room Calendar Page
 config.page.planner.title=Planner
-config.page.planner.description=Openfire Meetings Planner Page
-config.page.email.listener.description=Openfire Meetings Email Listener Page
+config.page.planner.description=Pade Meetings Planner Page
+config.page.email.listener.description=Pade Meetings Email Listener Page
 config.page.email.listener.title=Email Listener
 config.page.configuration.connectivity.title=Connectivity
 config.page.configuration.connectivity.description=The public web application is currently being served at <a target="_blank" href="{0}">{0}</a>

ofmeet/src/java/org/jivesoftware/openfire/plugin/ofmeet/MeetingPlanner.java

@@ -313,7 +313,7 @@ public static void sendEmail(String toName, String toAddress, String subject, St
     {
         try {
             String fromAddress = "no_reply@" + JiveGlobals.getProperty("ofmeet.email.domain", XMPPServer.getInstance().getServerInfo().getXMPPDomain());
-            String fromName = JiveGlobals.getProperty("ofmeet.email.fromname", "Openfire Meetings");
+            String fromName = JiveGlobals.getProperty("ofmeet.email.fromname", "Pade Meetings");
 
             Log.debug( "sendEmail " + toAddress + " " + subject + "\n " + body + "\n " + htmlBody);
             EmailService.getInstance().sendMessage(toName, toAddress, fromName, fromAddress, subject, body, htmlBody);

ofmeet/src/java/org/jivesoftware/openfire/plugin/ofmeet/OfMeetIQHandler.java

@@ -36,7 +36,7 @@ public class OfMeetIQHandler extends IQHandler
 
     public OfMeetIQHandler( Videobridge videobridge )
     {
-        super("Openfire Meetings IQ Handler");
+        super("Pade Meetings IQ Handler");
         this.videobridge = videobridge;
     }
 
@@ -46,7 +46,7 @@ public IQ handleIQ(IQ iq)
         IQ reply = IQ.createResultIQ(iq);
 
         try {
-            Log.info("Openfire Meetings handleIQ \n" + iq.toString());
+            Log.info("Pade Meetings handleIQ \n" + iq.toString());
             final Element element = iq.getChildElement();
 
             JSONObject requestJSON = new JSONObject( element.getText());
@@ -61,7 +61,7 @@ public IQ handleIQ(IQ iq)
             return reply;
 
         } catch(Exception e) {
-            Log.error("Openfire Meetings handleIQ", e);
+            Log.error("Pade Meetings handleIQ", e);
             reply.setError(new PacketError(PacketError.Condition.internal_server_error, PacketError.Type.modify, e.toString()));
             return reply;
         }

ofmeet/src/web/ofmeet-uisettings.jsp

@@ -291,7 +291,7 @@
         <table cellpadding="3" cellspacing="0" border="0" width="100%">
             <tr>
                 <td width="200"><fmt:message key="ofmeet.application.name"/>:</td>
-                <td><input type="text" size="60" maxlength="100" name="applicationName" value="${admin:getProperty("org.jitsi.videobridge.ofmeet.application.name", "Openfire Meetings")}"></td>
+                <td><input type="text" size="60" maxlength="100" name="applicationName" value="${admin:getProperty("org.jitsi.videobridge.ofmeet.application.name", "Pade Meetings")}"></td>
             </tr>
             <tr>
                 <td width="200"><fmt:message key="ofmeet.active.speaker.avatarsize"/>:</td>
@@ -462,7 +462,7 @@
         <table cellpadding="3" cellspacing="0" border="0" width="100%">
             <tr>
                 <td width="200"><fmt:message key="ofmeet.welcomepage.title"/>:</td>
-                <td><textarea placeholder="<fmt:message key="ofmeet.welcomepage.title.placeholder"/>" cols="60" rows="5" name="welcomeTitle">${admin:getProperty( "org.jitsi.videobridge.ofmeet.welcomepage.title", "Openfire Meetings")}</textarea></td>
+                <td><textarea placeholder="<fmt:message key="ofmeet.welcomepage.title.placeholder"/>" cols="60" rows="5" name="welcomeTitle">${admin:getProperty( "org.jitsi.videobridge.ofmeet.welcomepage.title", "Pade Meetings")}</textarea></td>
             </tr>  
             <tr>
                 <td width="200"><fmt:message key="ofmeet.welcomepage.description"/>:</td>

pade/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.igniterealtime.openfire.ofmeet</groupId>
         <artifactId>parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
     </parent>
 
     <artifactId>pade</artifactId>

pom.xml

@@ -18,7 +18,7 @@
 
     <groupId>org.igniterealtime.openfire.ofmeet</groupId>
     <artifactId>parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0</version>
     <packaging>pom</packaging>
 
     <organization>

videobridge/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.igniterealtime.openfire.ofmeet</groupId>
         <artifactId>parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
     </parent>
 
     <artifactId>videobridge</artifactId>

web/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.igniterealtime.openfire.ofmeet</groupId>
         <artifactId>parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
     </parent>
 
     <artifactId>web</artifactId>

web/src/main/java/org/jivesoftware/openfire/plugin/ofmeet/InterfaceConfigServlet.java

@@ -70,7 +70,7 @@ public void doGet( HttpServletRequest request, HttpServletResponse response ) th
             config.put( "GENERATE_ROOMNAMES_ON_WELCOME_PAGE",    JiveGlobals.getBooleanProperty( "org.jitsi.videobridge.ofmeet.random.roomnames",              true                ) );
             config.put( "DISPLAY_WELCOME_PAGE_CONTENT",          JiveGlobals.getBooleanProperty( "org.jitsi.videobridge.ofmeet.welcomepage.content",           true                ) );
             config.put( "DISPLAY_WELCOME_PAGE_TOOLBAR_ADDITIONAL_CONTENT",JiveGlobals.getBooleanProperty( "org.jitsi.videobridge.ofmeet.welcomepage.toolbarcontent",          false) );
-            config.put( "APP_NAME",                              JiveGlobals.getProperty(        "org.jitsi.videobridge.ofmeet.application.name",              "Openfire Meetings" ) );
+            config.put( "APP_NAME",                              JiveGlobals.getProperty(        "org.jitsi.videobridge.ofmeet.application.name",              "Pade Meetings"     ) );
             config.put( "LANG_DETECTION",                        JiveGlobals.getBooleanProperty( "org.jitsi.videobridge.ofmeet.enable.languagedetection",      false               ) );
             config.put( "INVITATION_POWERED_BY",                 JiveGlobals.getBooleanProperty( "org.jitsi.videobridge.ofmeet.invitation.poweredby",          true                ) );
             config.put( "VIDEO_LAYOUT_FIT",                      JiveGlobals.getProperty(        "org.jitsi.videobridge.ofmeet.video.layout.fit",              "both"              ) );
@@ -93,7 +93,7 @@ public void doGet( HttpServletRequest request, HttpServletResponse response ) th
             config.put( "OFMEET_SHOW_CAPTIONS",                  JiveGlobals.getBooleanProperty( "org.jitsi.videobridge.ofmeet.show.captions",                 false               ) );
             config.put( "OFMEET_ENABLE_TRANSCRIPTION",           JiveGlobals.getBooleanProperty( "org.jitsi.videobridge.ofmeet.enable.transcription",          false               ) );
             config.put( "OFMEET_CONTACTS_MGR",                   JiveGlobals.getBooleanProperty( "org.jitsi.videobridge.ofmeet.contacts.manager",              false               ) );
-            config.put( "OFMEET_WELCOME_PAGE_TITLE",             JiveGlobals.getProperty(        "org.jitsi.videobridge.ofmeet.welcomepage.title",             "Openfire Meetings" ) );
+            config.put( "OFMEET_WELCOME_PAGE_TITLE",             JiveGlobals.getProperty(        "org.jitsi.videobridge.ofmeet.welcomepage.title",             "Pade Meetings"     ) );
             config.put( "OFMEET_WELCOME_PAGE_DESCRIPTION",       JiveGlobals.getProperty(        "org.jitsi.videobridge.ofmeet.welcomepage.description",       ""                  ) );
             config.put( "OFMEET_WELCOME_PAGE_CONTENT",           JiveGlobals.getProperty(        "org.jitsi.videobridge.ofmeet.welcome.content",               ""                  ) );
             config.put( "OFMEET_WELCOME_PAGE_TOOLBARCONTENT",    JiveGlobals.getProperty(        "org.jitsi.videobridge.ofmeet.welcome.toolbarcontent",        ""                  ) );

web/src/main/webapp/manifest_ofmeet.json

@@ -1,6 +1,6 @@
 {
-    "short_name": "Openfire Meetings",
-    "name": "Openfire Meetings",
+    "short_name": "Pade Meetings",
+    "name": "Pade Meetings",
     "description": "High quality, secured and scalable video conferences with Jitsi and Openfire",    
     "icons": [
         {