Skip to content

O
Openfire
Commit 4b9f2797 authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gato
Browse files
Options

Rolling back unwanted and unexpected and incorrect and "turtle went away" changes. 

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@6978 b35dd754-fafc-0310-a699-88a17e54d16e
parent 2014c03e
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 54 deletions
Admin.iml
View file @ 4b9f2797
...@@ -16,9 +16,7 @@ ...@@ -16,9 +16,7 @@
<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 />
...@@ -43,11 +41,6 @@ ...@@ -43,11 +41,6 @@
<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" />
...@@ -138,11 +131,6 @@ ...@@ -138,11 +131,6 @@
<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" />
...@@ -178,31 +166,11 @@ ...@@ -178,31 +166,11 @@
<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" />
...@@ -213,16 +181,6 @@ ...@@ -213,16 +181,6 @@
<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 @ 4b9f2797
...@@ -391,9 +391,7 @@ ...@@ -391,9 +391,7 @@
<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="">
...@@ -402,9 +400,7 @@ ...@@ -402,9 +400,7 @@
<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">
...@@ -413,9 +409,7 @@ ...@@ -413,9 +409,7 @@
<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">
......
src/java/org/jivesoftware/wildfire/session/ClientSession.java
View file @ 4b9f2797
...@@ -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
......
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