Skip to content

O
Openfire
Commit 2014c03e authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gato
Browse files
Options

Updated change log with latest changes. 

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@6976 b35dd754-fafc-0310-a699-88a17e54d16e
parent 34ec53b1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 571 additions and 6 deletions
Admin.iml
View file @ 2014c03e
...@@ -16,7 +16,9 @@ ...@@ -16,7 +16,9 @@
<root url="jar://$MODULE_DIR$/src/web/WEB-INF/lib/dwr.jar!/" /> <root url="jar://$MODULE_DIR$/src/web/WEB-INF/lib/dwr.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES>
<root url="file://$MODULE_DIR$/../../java/dwr-1.1.4-src/java" />
</SOURCES>
</library> </library>
</orderEntry> </orderEntry>
<orderEntryProperties /> <orderEntryProperties />
...@@ -41,6 +43,11 @@ ...@@ -41,6 +43,11 @@
<attribute name="URI" value="/WEB-INF/lib/ant-contrib.jar" /> <attribute name="URI" value="/WEB-INF/lib/ant-contrib.jar" />
<url>jar://$MODULE_DIR$/build/lib/ant-contrib.jar!/</url> <url>jar://$MODULE_DIR$/build/lib/ant-contrib.jar!/</url>
</containerElement> </containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/ant-jive-edition.jar" />
<url>jar://$MODULE_DIR$/build/lib/ant-jive-edition.jar!/</url>
</containerElement>
<containerElement type="library" level="module"> <containerElement type="library" level="module">
<attribute name="method" value="0" /> <attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/ant-subdirtask.jar" /> <attribute name="URI" value="/WEB-INF/lib/ant-subdirtask.jar" />
...@@ -131,6 +138,11 @@ ...@@ -131,6 +138,11 @@
<attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" /> <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
<url>jar://$MODULE_DIR$/build/lib/merge/commons-logging.jar!/</url> <url>jar://$MODULE_DIR$/build/lib/merge/commons-logging.jar!/</url>
</containerElement> </containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/dbutil.jar" />
<url>jar://$MODULE_DIR$/build/lib/merge/dbutil.jar!/</url>
</containerElement>
<containerElement type="library" level="module"> <containerElement type="library" level="module">
<attribute name="method" value="0" /> <attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/dom4j.jar" /> <attribute name="URI" value="/WEB-INF/lib/dom4j.jar" />
...@@ -166,11 +178,31 @@ ...@@ -166,11 +178,31 @@
<attribute name="URI" value="/WEB-INF/lib/jstl.jar" /> <attribute name="URI" value="/WEB-INF/lib/jstl.jar" />
<url>jar://$MODULE_DIR$/build/lib/merge/jstl.jar!/</url> <url>jar://$MODULE_DIR$/build/lib/merge/jstl.jar!/</url>
</containerElement> </containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/jstun-0.6.1.jar" />
<url>jar://$MODULE_DIR$/build/lib/merge/jstun-0.6.1.jar!/</url>
</containerElement>
<containerElement type="library" level="module"> <containerElement type="library" level="module">
<attribute name="method" value="0" /> <attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/jzlib.jar" /> <attribute name="URI" value="/WEB-INF/lib/jzlib.jar" />
<url>jar://$MODULE_DIR$/build/lib/merge/jzlib.jar!/</url> <url>jar://$MODULE_DIR$/build/lib/merge/jzlib.jar!/</url>
</containerElement> </containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/mina-core-1.2.0.jar" />
<url>jar://$MODULE_DIR$/build/lib/merge/mina-core-1.2.0.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/mina-filter-compression-1.2.0.jar" />
<url>jar://$MODULE_DIR$/build/lib/merge/mina-filter-compression-1.2.0.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/mina-filter-ssl-1.2.0.jar" />
<url>jar://$MODULE_DIR$/build/lib/merge/mina-filter-ssl-1.2.0.jar!/</url>
</containerElement>
<containerElement type="library" level="module"> <containerElement type="library" level="module">
<attribute name="method" value="0" /> <attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/shaj.jar" /> <attribute name="URI" value="/WEB-INF/lib/shaj.jar" />
...@@ -181,6 +213,16 @@ ...@@ -181,6 +213,16 @@
<attribute name="URI" value="/WEB-INF/lib/sitemesh.jar" /> <attribute name="URI" value="/WEB-INF/lib/sitemesh.jar" />
<url>jar://$MODULE_DIR$/build/lib/merge/sitemesh.jar!/</url> <url>jar://$MODULE_DIR$/build/lib/merge/sitemesh.jar!/</url>
</containerElement> </containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/slf4j-api-1.1.0.jar" />
<url>jar://$MODULE_DIR$/build/lib/merge/slf4j-api-1.1.0.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/slf4j-simple-1.1.0.jar" />
<url>jar://$MODULE_DIR$/build/lib/merge/slf4j-simple-1.1.0.jar!/</url>
</containerElement>
<containerElement type="library" level="module"> <containerElement type="library" level="module">
<attribute name="method" value="0" /> <attribute name="method" value="0" />
<attribute name="URI" value="/WEB-INF/lib/standard.jar" /> <attribute name="URI" value="/WEB-INF/lib/standard.jar" />
......
Wildfire.iml
View file @ 2014c03e
...@@ -391,7 +391,9 @@ ...@@ -391,7 +391,9 @@
<root url="jar://$MODULE_DIR$/build/lib/merge/mina-filter-ssl-1.2.0.jar!/" /> <root url="jar://$MODULE_DIR$/build/lib/merge/mina-filter-ssl-1.2.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES>
<root url="file://$MODULE_DIR$/../../java/mina-1.2/filter-ssl/src/main/java" />
</SOURCES>
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library" exported=""> <orderEntry type="module-library" exported="">
...@@ -400,7 +402,9 @@ ...@@ -400,7 +402,9 @@
<root url="jar://$MODULE_DIR$/build/lib/merge/mina-core-1.2.0.jar!/" /> <root url="jar://$MODULE_DIR$/build/lib/merge/mina-core-1.2.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES>
<root url="file://$MODULE_DIR$/../../java/mina-1.2/core/src/main/java" />
</SOURCES>
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library"> <orderEntry type="module-library">
...@@ -409,7 +413,9 @@ ...@@ -409,7 +413,9 @@
<root url="jar://$MODULE_DIR$/build/lib/merge/mina-filter-compression-1.2.0.jar!/" /> <root url="jar://$MODULE_DIR$/build/lib/merge/mina-filter-compression-1.2.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES>
<root url="file://$MODULE_DIR$/../../java/mina-1.2/filter-compression/src/main/java" />
</SOURCES>
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library"> <orderEntry type="module-library">
......
documentation/dist/changelog.html
View file @ 2014c03e
...@@ -228,6 +228,7 @@ hr { ...@@ -228,6 +228,7 @@ hr {
<li>[<a href='http://www.igniterealtime.org/issues/browse/ENT-56'>ENT-56</a>] - Warning message is now displayed when license is about to expire (30 days).</li> <li>[<a href='http://www.igniterealtime.org/issues/browse/ENT-56'>ENT-56</a>] - Warning message is now displayed when license is about to expire (30 days).</li>
<li>[<a href='http://www.igniterealtime.org/issues/browse/ENT-54'>ENT-54</a>] - Added support for iq:version to components to discover Wildfire version.</li> <li>[<a href='http://www.igniterealtime.org/issues/browse/ENT-54'>ENT-54</a>] - Added support for iq:version to components to discover Wildfire version.</li>
<li>[<a href='http://www.igniterealtime.org/issues/browse/ENT-55'>ENT-55</a>] - Changed license validation to validate maintenance date.</li> <li>[<a href='http://www.igniterealtime.org/issues/browse/ENT-55'>ENT-55</a>] - Changed license validation to validate maintenance date.</li>
<li>[<a href='http://www.igniterealtime.org/issues/browse/ENT-62'>ENT-62</a>] - Fixed display error in dashboard when accessing the page immediately after start up.</li>
<li>[<a href='http://www.igniterealtime.org/issues/browse/ENT-37'>ENT-37</a>] - Fixed error in MSSQL due to conflict with keyword.</li> <li>[<a href='http://www.igniterealtime.org/issues/browse/ENT-37'>ENT-37</a>] - Fixed error in MSSQL due to conflict with keyword.</li>
<li>[<a href='http://www.igniterealtime.org/issues/browse/ENT-59'>ENT-59</a>] - Added Portuguese translation.</li> <li>[<a href='http://www.igniterealtime.org/issues/browse/ENT-59'>ENT-59</a>] - Added Portuguese translation.</li>
</ul> </ul>
......
src/java/org/jivesoftware/wildfire/session/ClientSession.java
View file @ 2014c03e
...@@ -672,11 +672,11 @@ public class ClientSession extends Session { ...@@ -672,11 +672,11 @@ public class ClientSession extends Session {
// Include Stream Compression Mechanism // Include Stream Compression Mechanism
// TODO Fix stream compression when using MINA and then enable this code // TODO Fix stream compression when using MINA and then enable this code
/*if (conn.getCompressionPolicy() != Connection.CompressionPolicy.disabled && if (conn.getCompressionPolicy() != Connection.CompressionPolicy.disabled &&
!conn.isCompressed()) { !conn.isCompressed()) {
sb.append( sb.append(
"<compression xmlns=\"http://jabber.org/features/compress\"><method>zlib</method></compression>"); "<compression xmlns=\"http://jabber.org/features/compress\"><method>zlib</method></compression>");
}*/ }
if (getAuthToken() == null) { if (getAuthToken() == null) {
// Advertise that the server supports Non-SASL Authentication // Advertise that the server supports Non-SASL Authentication
......
src/plugins/userCreation/plugin.xml 0 → 100644
View file @ 2014c03e
<?xml version="1.0" encoding="UTF-8"?>
<!--
Plugin configuration for the broadcast plugin.
-->
<plugin>
<class>org.jivesoftware.wildfire.plugin.UserCreationPlugin</class>
<name>User Creation</name>
<description>Creates users and populates rosters.</description>
<author>Jive Software</author>
<version>1.0</version>
<date>12/10/2006</date>
<url>http://www.igniterealtime.org</url>
<minServerVersion>3.1.0</minServerVersion>
<adminconsole>
<tab id="tab-users">
<sidebar id="sidebar-users">
<item id="users-creation" name="Users Creation"
url="users-creation.jsp"
description="Quickly create users and populate their rosters" />
</sidebar>
</tab>
</adminconsole>
</plugin>
\ No newline at end of file
src/plugins/userCreation/src/web/users-creation.jsp 0 → 100644
View file @ 2014c03e
<%@ page import="org.jivesoftware.util.ParamUtils,
org.jivesoftware.util.TaskEngine,
org.jivesoftware.wildfire.XMPPServer,
org.jivesoftware.wildfire.plugin.UserCreationPlugin,
java.util.HashMap,
java.util.Map"
%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<html>
<head>
<title>Quick Users Creation</title>
<meta name="pageID" content="users-creation"/>
</head>
<body>
<%
String prefix = ParamUtils.getParameter(request, "prefix");
String from = ParamUtils.getParameter(request, "from");
String total = ParamUtils.getParameter(request, "total");
String usersPerRoster = ParamUtils.getParameter(request, "usersPerRoster");
Map<String, String> errors = new HashMap<String, String>();
boolean running = false;
if (prefix != null) {
final String userPrefix = prefix;
final int intFrom = Integer.parseInt(from);
final int maxUsers = Integer.parseInt(total);
final int usersRoster = Integer.parseInt(usersPerRoster) + 1;
if (maxUsers % usersRoster != 0 || maxUsers <= usersRoster) {
errors.put("arguments", "");
}
if (errors.isEmpty()) {
final UserCreationPlugin plugin =
(UserCreationPlugin) XMPPServer.getInstance().getPluginManager().getPlugin("usercreation");
TaskEngine.getInstance().submit(new Runnable() {
public void run() {
plugin.createUsers(userPrefix, intFrom, maxUsers);
plugin.populateRosters(userPrefix, intFrom, maxUsers, usersRoster);
plugin.createVCards(userPrefix, intFrom, maxUsers);
}
});
running = true;
}
}
%>
<% if (!errors.isEmpty()) { %>
<div class="jive-error">
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
<tr>
<td class="jive-icon"><img src="/images/error-16x16.gif" width="16" height="16" border="0"/></td>
<td class="jive-icon-label">
<% if (errors.get("arguments") != null) { %>
Number of users per roster should be greater than total number of users. Number of users per roster <b>plus one</b> should also be a multiple of total number of users.
<% } %>
</td>
</tr>
</tbody>
</table>
</div>
<br>
<% } else if (running) { %>
<div class="jive-success">
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
<tr><td class="jive-icon"><img src="/images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label">
Users being created in background and getting their rosters populated. Check the stdout for more information.
</td></tr>
</tbody>
</table>
</div><br>
<% } %>
<form name="f" action="users-creation.jsp">
<fieldset>
<legend>Creation Form</legend>
<div>
<table cellpadding="3" cellspacing="1" border="0" width="600">
<tr class="c1">
<td width="1%" colspan="2" nowrap>
User prefix:
&nbsp;<input type="text" name="prefix" value="<%=(prefix != null ? prefix : "") %>" size="30" maxlength="75"/>
</td>
</tr>
<tr class="c1">
<td width="1%" colspan="2" nowrap>
From index:
&nbsp;<input type="text" name="from" value="<%=(from != null ? from : "0") %>" size="5" maxlength="15"/>
</td>
</tr>
<tr class="c1">
<td width="1%" colspan="2" nowrap>
Total users:
&nbsp;<input type="text" name="total" value="<%=(total != null ? total : "1000") %>" size="5" maxlength="15"/>
</td>
</tr>
<tr class="c1">
<td width="1%" colspan="2" nowrap>
Contacts in roster:
&nbsp;<input type="text" name="usersPerRoster" value="<%=(usersPerRoster != null ? usersPerRoster : "30") %>" size="5" maxlength="15"/>
</td>
</tr>
<tr class="c1">
<td width="1%" colspan="2" nowrap>
<input type="submit" name="Create"/>
</td>
</tr>
</table>
</div>
</fieldset>
</form>
</body>
</html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023