diff --git a/plugin.xml b/plugin.xml index 84e57fb1f..8e8bf85d2 100644 --- a/plugin.xml +++ b/plugin.xml @@ -7,6 +7,6 @@ Tom Evans ${project.version} tbc - 4.3.0 + 4.0.0 1.8 diff --git a/pom.xml b/pom.xml index 3ee3799aa..e3feb241f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ plugins org.igniterealtime.openfire - 4.3.0-beta + 4.3.0 org.igniterealtime.openfire.plugins hazelcast @@ -33,6 +33,10 @@ maven-assembly-plugin + + org.eclipse.jetty + jetty-jspc-maven-plugin + diff --git a/src/i18n/hazelcast_i18n.properties b/src/i18n/hazelcast_i18n.properties deleted file mode 100644 index 94ae8c20b..000000000 --- a/src/i18n/hazelcast_i18n.properties +++ /dev/null @@ -1,9 +0,0 @@ -## -## Hazelcast Clustering Resource Bundle -## -## REVISION HISTORY -## -## 1.0.0 -## Initial Release -plugin.name=Hazelcast Clustering Plugin -plugin.description=Clustering support for Openfire, powered by Hazelcast. diff --git a/src/java/org/apache/jasper/runtime/JspSourceImports.java b/src/java/org/apache/jasper/runtime/JspSourceImports.java new file mode 100644 index 000000000..09f58d822 --- /dev/null +++ b/src/java/org/apache/jasper/runtime/JspSourceImports.java @@ -0,0 +1,30 @@ +/* + * 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.jasper.runtime; + +import java.util.Set; + +/** + * The EL engine needs access to the imports used in the JSP page to configure + * the ELContext. The imports are available at compile time but the ELContext + * is created lazily per page. This interface exposes the imports at runtime so + * that they may be added to the ELContext when it is created. + */ +public interface JspSourceImports { + Set getPackageImports(); + Set getClassImports(); +} diff --git a/src/java/org/jivesoftware/openfire/plugin/util/cluster/NodeRuntimeStats.java b/src/java/org/jivesoftware/openfire/plugin/util/cluster/NodeRuntimeStats.java index 8453246fb..dc764477b 100644 --- a/src/java/org/jivesoftware/openfire/plugin/util/cluster/NodeRuntimeStats.java +++ b/src/java/org/jivesoftware/openfire/plugin/util/cluster/NodeRuntimeStats.java @@ -23,7 +23,6 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import java.util.ResourceBundle; import org.jivesoftware.openfire.cluster.NodeID; import org.jivesoftware.util.cache.CacheFactory; @@ -35,13 +34,6 @@ */ public class NodeRuntimeStats { - // This properties file is located in the Hazelcast JAR - private static final ResourceBundle config = ResourceBundle.getBundle("hazelcast-runtime"); - - public static String getProviderConfig(String key) { - return config.getString(key); - } - /** * Returns a Map of HazelcastRuntimeStats.NodeInfo objects keyed by cluster Member objects. * A NodeInfo object is a collection of various Node stats. diff --git a/src/web/WEB-INF/web.xml b/src/web/WEB-INF/web.xml new file mode 100644 index 000000000..5fae1f077 --- /dev/null +++ b/src/web/WEB-INF/web.xml @@ -0,0 +1,6 @@ + + + diff --git a/src/web/system-clustering-node.jsp b/src/web/system-clustering-node.jsp index aa1612b1c..877789044 100644 --- a/src/web/system-clustering-node.jsp +++ b/src/web/system-clustering-node.jsp @@ -2,10 +2,6 @@ <%@ page import="org.jivesoftware.openfire.plugin.util.cluster.NodeRuntimeStats, org.jivesoftware.util.cache.CacheFactory, com.hazelcast.core.Hazelcast, - com.hazelcast.core.Cluster, - com.hazelcast.core.Member, - com.hazelcast.config.ClasspathXmlConfig, - com.hazelcast.config.Config, org.jivesoftware.openfire.cluster.ClusterManager, org.jivesoftware.openfire.cluster.NodeID, org.jivesoftware.openfire.cluster.ClusterNodeInfo" @@ -19,15 +15,10 @@ <%@ page import="java.text.DecimalFormat" %> <%@ page import="java.text.NumberFormat" %> <%@ page import="java.util.*" %> -<%@ page import="java.util.LinkedList" %> <% webManager.init(request, response, session, application, out ); %> - -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> - Cluster Node Information @@ -383,26 +374,6 @@ Cache statistics for this cluster node appear below.

-
- - - - - - - - - - - -
- Openfire Cluster Details -
- Hazelcast Version <%= NodeRuntimeStats.getProviderConfig("hazelcast.version") %> - Build <%= NodeRuntimeStats.getProviderConfig("hazelcast.build") %> -
-
-