You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by be...@apache.org on 2010/12/29 10:00:34 UTC
svn commit: r1053570 - in /mina/vysper/trunk/server: core/
core/src/main/config/ core/src/main/java/org/apache/vysper/spring/
core/src/main/java/org/apache/vysper/xmpp/server/ extensions/xep0045-muc/
Author: berndf
Date: Wed Dec 29 09:00:33 2010
New Revision: 1053570
URL: http://svn.apache.org/viewvc?rev=1053570&view=rev
Log:
do not use random passwords per default
Modified:
mina/vysper/trunk/server/core/pom.xml
mina/vysper/trunk/server/core/src/main/config/spring-config.xml
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/spring/AddUserHelper.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/ServerMain.java
mina/vysper/trunk/server/extensions/xep0045-muc/pom.xml
Modified: mina/vysper/trunk/server/core/pom.xml
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/pom.xml?rev=1053570&r1=1053569&r2=1053570&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/pom.xml (original)
+++ mina/vysper/trunk/server/core/pom.xml Wed Dec 29 09:00:33 2010
@@ -106,13 +106,11 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
Modified: mina/vysper/trunk/server/core/src/main/config/spring-config.xml
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/config/spring-config.xml?rev=1053570&r1=1053569&r2=1053570&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/config/spring-config.xml (original)
+++ mina/vysper/trunk/server/core/src/main/config/spring-config.xml Wed Dec 29 09:00:33 2010
@@ -35,11 +35,10 @@
<bean id="addUsers" class="org.apache.vysper.spring.AddUserHelper">
<constructor-arg index="0">
<map>
- <entry key="admin@vysper.org" value="" />
- <entry key="user1@vysper.org" value="" />
- <entry key="user2@vysper.org" value="" />
- <entry key="user3@vysper.org" value="" />
- <!--<entry key="admin@vysper.org" value="CHOOSE A SECURE PASSWORD OR LEAVE EMPTY" />-->
+ <entry key="admin@vysper.org" value="CHOOSE A SECURE PASSWORD" />
+ <!--<entry key="user1@vysper.org" value="CHOOSE A SECURE PASSWORD" />-->
+ <!--<entry key="user2@vysper.org" value="CHOOSE A SECURE PASSWORD" />-->
+ <!--<entry key="user3@vysper.org" value="CHOOSE A SECURE PASSWORD" />-->
</map>
</constructor-arg>
<property name="storageProviderRegistry" ref="storageRegistry" />
@@ -91,7 +90,7 @@
make sure they are on the classpath when enabling them or remove the beans below,
depending on the features your server should expose -->
<!--<bean class="org.apache.vysper.xmpp.modules.extension.xep0060_pubsub.PublishSubscribeModule" />-->
- <!--<bean class="org.apache.vysper.xmpp.modules.extension.xep0045_muc.MUCModule" />-->
+ <bean class="org.apache.vysper.xmpp.modules.extension.xep0045_muc.MUCModule" />
</list>
</property>
</bean>
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/spring/AddUserHelper.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/spring/AddUserHelper.java?rev=1053570&r1=1053569&r2=1053570&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/spring/AddUserHelper.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/spring/AddUserHelper.java Wed Dec 29 09:00:33 2010
@@ -53,9 +53,9 @@ public class AddUserHelper {
String password = userPasswordMap.get(user);
if (StringUtils.isEmpty(password)) {
password = RandomStringUtils.randomAlphanumeric(8);
+ System.out.println(user + " user will be added with random password: '" + password + "'");
}
accountManagement.addUser(user, password);
- System.out.println(user + " user has been added with random password: '" + password + "'");
}
}
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/ServerMain.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/ServerMain.java?rev=1053570&r1=1053569&r2=1053570&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/ServerMain.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/ServerMain.java Wed Dec 29 09:00:33 2010
@@ -77,10 +77,9 @@ public class ServerMain {
final AccountManagement accountManagement = (AccountManagement) providerRegistry
.retrieve(AccountManagement.class);
+ String initialPassword = System.getProperty("vysper.admin.initial.password", "CHOOSE SECURE PASSWORD");
if (!accountManagement.verifyAccountExists(EntityImpl.parse(adminJID))) {
- final String randomPassword = RandomStringUtils.randomAlphanumeric(8);
- accountManagement.addUser(adminJID, randomPassword);
- System.out.println(adminJID + " user has been added with random password: '" + randomPassword + "'");
+ accountManagement.addUser(adminJID, initialPassword);
}
XMPPServer server = new XMPPServer(domain);
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/pom.xml
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/pom.xml?rev=1053570&r1=1053569&r2=1053570&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/pom.xml (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/pom.xml Wed Dec 29 09:00:33 2010
@@ -41,6 +41,82 @@
<artifactId>vysper-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.vysper</groupId>
+ <artifactId>nbxml</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.vysper.extensions</groupId>
+ <artifactId>xep0045-muc</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.vysper.extensions</groupId>
+ <artifactId>xep0060-pubsub</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.vysper.extensions</groupId>
+ <artifactId>xep0124-xep0206-bosh</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-integration-jmx</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ </dependency>
+
+ <!-- Logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ <optional>true</optional>
+ </dependency>
+
<!-- Runtime dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
Re: svn commit: r1053570 - in /mina/vysper/trunk/server: core/
core/src/main/config/ core/src/main/java/org/apache/vysper/spring/
core/src/main/java/org/apache/vysper/xmpp/server/ extensions/xep0045-muc/
Posted by Niklas Gustavsson <ni...@protocol7.com>.
On Wed, Dec 29, 2010 at 10:37 AM, Niklas Gustavsson
<ni...@protocol7.com> wrote:
> A few comments inline:
You beat me to it :-)
/niklas
Re: svn commit: r1053570 - in /mina/vysper/trunk/server: core/
core/src/main/config/ core/src/main/java/org/apache/vysper/spring/
core/src/main/java/org/apache/vysper/xmpp/server/ extensions/xep0045-muc/
Posted by Niklas Gustavsson <ni...@protocol7.com>.
A few comments inline:
On Wed, Dec 29, 2010 at 10:00 AM, <be...@apache.org> wrote:
> Modified: mina/vysper/trunk/server/core/pom.xml
> URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/pom.xml?rev=1053570&r1=1053569&r2=1053570&view=diff
> ==============================================================================
> --- mina/vysper/trunk/server/core/pom.xml (original)
> +++ mina/vysper/trunk/server/core/pom.xml Wed Dec 29 09:00:33 2010
> @@ -106,13 +106,11 @@
> <dependency>
> <groupId>org.slf4j</groupId>
> <artifactId>slf4j-log4j12</artifactId>
> - <scope>test</scope>
> </dependency>
>
> <dependency>
> <groupId>log4j</groupId>
> <artifactId>log4j</artifactId>
> - <scope>test</scope>
> </dependency>
These should be test scope, or slf4j-log4j12 and log4j would be
required for all downstream users, which seems contra productive given
we use a logging facade
> Modified: mina/vysper/trunk/server/extensions/xep0045-muc/pom.xml
> URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/pom.xml?rev=1053570&r1=1053569&r2=1053570&view=diff
> ==============================================================================
> --- mina/vysper/trunk/server/extensions/xep0045-muc/pom.xml (original)
> +++ mina/vysper/trunk/server/extensions/xep0045-muc/pom.xml Wed Dec 29 09:00:33 2010
> @@ -41,6 +41,82 @@
> <artifactId>vysper-core</artifactId>
> </dependency>
>
> + <dependency>
> + <groupId>commons-codec</groupId>
> + <artifactId>commons-codec</artifactId>
> + </dependency>
> +
> + <dependency>
> + <groupId>commons-io</groupId>
> + <artifactId>commons-io</artifactId>
> + <version>1.4</version>
> + </dependency>
> +
> + <dependency>
> + <groupId>org.apache.vysper</groupId>
> + <artifactId>nbxml</artifactId>
> + </dependency>
> +
> + <dependency>
> + <groupId>org.apache.vysper.extensions</groupId>
> + <artifactId>xep0045-muc</artifactId>
> + </dependency>
> +
> + <dependency>
> + <groupId>org.apache.vysper.extensions</groupId>
> + <artifactId>xep0060-pubsub</artifactId>
> + </dependency>
> +
> + <dependency>
> + <groupId>org.apache.vysper.extensions</groupId>
> + <artifactId>xep0124-xep0206-bosh</artifactId>
> + </dependency>
> +
> + <dependency>
> + <groupId>org.springframework</groupId>
> + <artifactId>spring</artifactId>
> + <optional>true</optional>
> + </dependency>
> +
> + <dependency>
> + <groupId>org.apache.mina</groupId>
> + <artifactId>mina-core</artifactId>
> + </dependency>
> +
> + <dependency>
> + <groupId>org.apache.mina</groupId>
> + <artifactId>mina-integration-jmx</artifactId>
> + <optional>true</optional>
> + </dependency>
> +
> + <dependency>
> + <groupId>javax.jcr</groupId>
> + <artifactId>jcr</artifactId>
> + </dependency>
> +
> + <dependency>
> + <groupId>org.apache.jackrabbit</groupId>
> + <artifactId>jackrabbit-core</artifactId>
> + </dependency>
> +
> + <!-- Logging -->
> + <dependency>
> + <groupId>org.slf4j</groupId>
> + <artifactId>slf4j-api</artifactId>
> + </dependency>
> +
> + <dependency>
> + <groupId>org.slf4j</groupId>
> + <artifactId>jcl-over-slf4j</artifactId>
> + <optional>true</optional>
> + </dependency>
> +
> + <dependency>
> + <groupId>net.sf.ehcache</groupId>
> + <artifactId>ehcache-core</artifactId>
> + <optional>true</optional>
> + </dependency>
> +
These should not be needed.
/niklas