You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2011/01/14 15:34:49 UTC
svn commit: r1059019 - in /mina/vysper/trunk: ./ server/admin-console/
server/admin-console/src/main/java/org/apache/vysper/console/
server/admin-console/src/main/resources/
server/admin-console/src/main/resources/velocity/
server/admin-console/src/mai...
Author: ngn
Date: Fri Jan 14 14:34:49 2011
New Revision: 1059019
URL: http://svn.apache.org/viewvc?rev=1059019&view=rev
Log:
Adding runner for an embedded admin console
Added:
mina/vysper/trunk/server/admin-console/src/main/java/org/apache/vysper/console/AdminConsole.java
mina/vysper/trunk/server/admin-console/src/main/resources/log4j.properties
- copied unchanged from r1057909, mina/vysper/trunk/server/admin-console/src/test/resources/log4j.properties
Removed:
mina/vysper/trunk/server/admin-console/src/test/resources/log4j.properties
Modified:
mina/vysper/trunk/pom.xml
mina/vysper/trunk/server/admin-console/pom.xml
mina/vysper/trunk/server/admin-console/src/main/resources/velocity/layout.vm
mina/vysper/trunk/server/admin-console/src/main/webapp/WEB-INF/console-servlet.xml
mina/vysper/trunk/server/admin-console/src/test/java/org/apache/vysper/console/MockHttpSession.java
mina/vysper/trunk/server/admin-console/src/test/java/org/apache/vysper/console/ServerMain.java
Modified: mina/vysper/trunk/pom.xml
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/pom.xml?rev=1059019&r1=1059018&r2=1059019&view=diff
==============================================================================
--- mina/vysper/trunk/pom.xml (original)
+++ mina/vysper/trunk/pom.xml Fri Jan 14 14:34:49 2011
@@ -92,6 +92,18 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>3.0.5.RELEASE</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.mina</groupId>
@@ -205,6 +217,12 @@
<version>7.2.1.v20101111</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>7.2.1.v20101111</version>
+ </dependency>
+
<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
Modified: mina/vysper/trunk/server/admin-console/pom.xml
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/admin-console/pom.xml?rev=1059019&r1=1059018&r2=1059019&view=diff
==============================================================================
--- mina/vysper/trunk/server/admin-console/pom.xml (original)
+++ mina/vysper/trunk/server/admin-console/pom.xml Fri Jan 14 14:34:49 2011
@@ -42,7 +42,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>3.0.5.RELEASE</version>
</dependency>
<dependency>
@@ -55,6 +54,52 @@
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
<version>2.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-chain</groupId>
+ <artifactId>commons-chain</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sslext</groupId>
+ <artifactId>sslext</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts-taglib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts-tiles</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -74,6 +119,12 @@
<artifactId>log4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
Added: mina/vysper/trunk/server/admin-console/src/main/java/org/apache/vysper/console/AdminConsole.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/admin-console/src/main/java/org/apache/vysper/console/AdminConsole.java?rev=1059019&view=auto
==============================================================================
--- mina/vysper/trunk/server/admin-console/src/main/java/org/apache/vysper/console/AdminConsole.java (added)
+++ mina/vysper/trunk/server/admin-console/src/main/java/org/apache/vysper/console/AdminConsole.java Fri Jan 14 14:34:49 2011
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ *
+ */
+package org.apache.vysper.console;
+
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.webapp.WebAppContext;
+
+
+
+public class AdminConsole {
+
+ private int port = 8080;
+ private Server server;
+
+ public void start() throws Exception {
+ server = new Server(port);
+
+ WebAppContext context = new WebAppContext();
+ context.setDescriptor("src/main/webapp/WEB-INF/web.xml");
+ context.setResourceBase("src/main/webapp");
+ context.setContextPath("/");
+
+ server.setHandler(context);
+
+ server.start();
+ }
+
+ public void stop() throws Exception {
+ server.stop();
+ }
+}
Modified: mina/vysper/trunk/server/admin-console/src/main/resources/velocity/layout.vm
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/admin-console/src/main/resources/velocity/layout.vm?rev=1059019&r1=1059018&r2=1059019&view=diff
==============================================================================
--- mina/vysper/trunk/server/admin-console/src/main/resources/velocity/layout.vm (original)
+++ mina/vysper/trunk/server/admin-console/src/main/resources/velocity/layout.vm Fri Jan 14 14:34:49 2011
@@ -45,6 +45,8 @@
#if($authenticated)
<div id="navigation">
+ <li><a href="#springUrl("/")">Home</a></li>
+
<h3>Users</h3>
<ul>
<li><a href="#springUrl("/get-online-users-num")">Get number of online users</a></li>
Modified: mina/vysper/trunk/server/admin-console/src/main/webapp/WEB-INF/console-servlet.xml
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/admin-console/src/main/webapp/WEB-INF/console-servlet.xml?rev=1059019&r1=1059018&r2=1059019&view=diff
==============================================================================
--- mina/vysper/trunk/server/admin-console/src/main/webapp/WEB-INF/console-servlet.xml (original)
+++ mina/vysper/trunk/server/admin-console/src/main/webapp/WEB-INF/console-servlet.xml Fri Jan 14 14:34:49 2011
@@ -63,13 +63,9 @@
<property name="layoutUrl" value="layout.vm" />
<property name="screenContentKey" value="screen_content"/>
<property name="layoutKey" value="layout"/>
- <!-- <property name="cache" value="true"/>-->
<property name="prefix" value="" />
<property name="suffix" value=".vm" />
<property name="contentType" value="text/html; charset=UTF-8" />
- <property name="exposeRequestAttributes" value="true"/>
- <property name="exposeSessionAttributes" value="true"/>
- <property name="exposeSpringMacroHelpers" value="true"/>
</bean>
Modified: mina/vysper/trunk/server/admin-console/src/test/java/org/apache/vysper/console/MockHttpSession.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/admin-console/src/test/java/org/apache/vysper/console/MockHttpSession.java?rev=1059019&r1=1059018&r2=1059019&view=diff
==============================================================================
--- mina/vysper/trunk/server/admin-console/src/test/java/org/apache/vysper/console/MockHttpSession.java (original)
+++ mina/vysper/trunk/server/admin-console/src/test/java/org/apache/vysper/console/MockHttpSession.java Fri Jan 14 14:34:49 2011
@@ -90,6 +90,7 @@ public class MockHttpSession implements
return 0;
}
+ @SuppressWarnings("rawtypes")
public Enumeration getAttributeNames() {
return null;
}
Modified: mina/vysper/trunk/server/admin-console/src/test/java/org/apache/vysper/console/ServerMain.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/admin-console/src/test/java/org/apache/vysper/console/ServerMain.java?rev=1059019&r1=1059018&r2=1059019&view=diff
==============================================================================
--- mina/vysper/trunk/server/admin-console/src/test/java/org/apache/vysper/console/ServerMain.java (original)
+++ mina/vysper/trunk/server/admin-console/src/test/java/org/apache/vysper/console/ServerMain.java Fri Jan 14 14:34:49 2011
@@ -47,15 +47,12 @@ import org.apache.vysper.xmpp.server.XMP
public class ServerMain {
/**
- * boots the server as a standalone application
- *
- * adding a module from the command line:
- * using a runtime property, one or more modules can be specified, like this:
- * -Dvysper.add.module=org.apache.vysper.xmpp.modules.extension.xep0060_pubsub.PublishSubscribeModule,... more ...
+ * boots the XMPP server and admin console as a standalone application
*
* @param args
+ * @throws Exception
*/
- public static void main(String[] args) throws AccountCreationException, FileNotFoundException {
+ public static void main(String[] args) throws Exception {
String domain = "vysper.org";
@@ -77,12 +74,8 @@ public class ServerMain {
server.setTLSCertificateInfo(new File("src/main/resources/bogus_mina_tls.cert"), "boguspw");
- try {
- server.start();
- System.out.println("vysper server is running...");
- } catch (Exception e) {
- e.printStackTrace();
- }
+ server.start();
+ System.out.println("Vysper server is running...");
server.addModule(new SoftwareVersionModule());
server.addModule(new EntityTimeModule());
@@ -94,5 +87,10 @@ public class ServerMain {
// unless admin user account with a secure password is added, this will be not become effective
serviceAdministrationModule.setAddAdminJIDs(Arrays.asList(adminJID));
server.addModule(serviceAdministrationModule);
+
+ // start the admin console
+ AdminConsole console = new AdminConsole();
+ console.start();
+ System.out.println("Admin console is running...");
}
}