[wsas-java-dev] svn commit r595 - in wsas/java/trunk: .
modules/admin/src/org/wso2/wsas/admin/service
modules/core/src/org/wso2/wsas/feed
modules/core/src/org/wso2/wsas/util modules/www/extensions/core/js
svn at wso2.com
svn at wso2.com
Wed Jan 24 03:26:14 PST 2007
Author: azeez
Date: Wed Jan 24 03:24:56 2007
New Revision: 595
Added:
wsas/java/trunk/modules/core/src/org/wso2/wsas/util/AdminServicesFilter.java
Modified:
wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java
wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/StatisticsClient.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/feed/FeedListener.java
wsas/java/trunk/modules/www/extensions/core/js/tracer.js
wsas/java/trunk/pom.xml
Log:
Filter out admin service from RSS/Atom feeds, and changed axis2 version
Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java (original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java Wed Jan 24 03:24:56 2007
@@ -327,8 +327,13 @@
}
}
- // returns a list of pairs: (service id, service version, service name
- // string)
+ /**
+ *
+ * @param serviceGroupId
+ * @param serviceGroupVersion
+ * @return
+ * @throws AxisFault
+ */
public ServiceMetaData[] listServices(String serviceGroupId,
String serviceGroupVersion) throws AxisFault {
AxisServiceGroup asg = getAxisConfig().getServiceGroup(serviceGroupId);
Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java (original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java Wed Jan 24 03:24:56 2007
@@ -19,6 +19,7 @@
import org.wso2.wsas.admin.service.util.ServiceGroupMetaData;
import org.wso2.wsas.util.ParameterUtil;
import org.wso2.wsas.util.HibernateConfigFactory;
+import org.wso2.wsas.util.AdminServicesFilter;
import org.wso2.wsas.persistence.PersistenceManager;
import org.wso2.wsas.persistence.exception.DuplicateEntityException;
import org.wso2.wsas.persistence.dataobject.ServiceGroupDO;
@@ -60,11 +61,9 @@
AxisServiceGroup axisServiceGroup = (AxisServiceGroup) sgs.next();
String sgName = axisServiceGroup.getServiceGroupName();
- if (ServerConstants.ADMINISTRATION_SERVICE_GROUP.equals(sgName) ||
- sgName.endsWith(ServerConstants.STATISTICS_SERVICE_GROUP) ||
- sgName.endsWith(ServerConstants.TRACER_SERVICE_GROUP) ||
- sgName.startsWith(ServerConstants.CODEGEN_SERVICE_GROUP)) {
- // NO need to display Admin Service Groups
+ if (AdminServicesFilter.isFiltered(sgName)) {
+
+ // No need to display Admin Service Groups
continue;
}
Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/StatisticsClient.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/StatisticsClient.java (original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/StatisticsClient.java Wed Jan 24 03:24:56 2007
@@ -15,14 +15,11 @@
*/
package org.wso2.wsas.admin.service;
+import org.apache.axis2.context.ConfigurationContext;
import org.wso2.statistics.service.StatisticsStub;
-import org.wso2.statistics.service.GetSystemRequestCountFaultException;
import org.wso2.utils.NetworkUtils;
-import org.wso2.wsas.ServerManager;
import org.wso2.wsas.ServerConstants;
-import org.apache.axis2.context.ConfigurationContext;
-
-import java.rmi.RemoteException;
+import org.wso2.wsas.ServerManager;
/**
*
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/feed/FeedListener.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/feed/FeedListener.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/feed/FeedListener.java Wed Jan 24 03:24:56 2007
@@ -16,7 +16,7 @@
*/
package org.wso2.wsas.feed;
-import org.wso2.wsas.ServerConstants;
+import org.wso2.wsas.util.AdminServicesFilter;
import org.wso2.wsas.feed.atom.AtomFeedBuilder;
import org.wso2.wsas.feed.rss.RSSFeedBuilder;
import org.apache.axiom.om.OMElement;
@@ -32,43 +32,43 @@
public static int MAX_ARRAY_SIZE = 10;
- private ParameterInclude paramterInclude = new ParameterIncludeImpl();
- private RSSFeedBuilder rssfiledBuilder;
+ private ParameterInclude parameterInclude = new ParameterIncludeImpl();
+ private RSSFeedBuilder rssFeedBuilder;
private AtomFeedBuilder atomFeedBuilder;
private ArrayList services;
// The initilization code will go here
public void init(AxisConfiguration axisConfig) {
- rssfiledBuilder = new RSSFeedBuilder(axisConfig);
+ rssFeedBuilder = new RSSFeedBuilder(axisConfig);
atomFeedBuilder = new AtomFeedBuilder(axisConfig);
services = new ArrayList();
}
public void serviceUpdate(AxisEvent event, AxisService service) {
AxisServiceGroup axisServiceGroup = (AxisServiceGroup) service.getParent();
- String item_home = FeedConstants.ITEM_URL_VALUE;
+ String itemHome = FeedConstants.ITEM_URL_VALUE;
if (getParameter(FeedConstants.ITEM_URL_KEY) != null) {
- item_home = getParameter(FeedConstants.ITEM_URL_KEY).getValue().toString();
+ itemHome = getParameter(FeedConstants.ITEM_URL_KEY).getValue().toString();
}
- if (ServerConstants.ADMINISTRATION_SERVICE_GROUP.equals(axisServiceGroup.getServiceGroupName())) {
+ if (AdminServicesFilter.isFiltered(axisServiceGroup.getServiceGroupName())) {
return;
}
if (services.contains(service)) {
- rssfiledBuilder.serviceUpdate(service, item_home);
- atomFeedBuilder.serviceUpdate(service, item_home);
+ rssFeedBuilder.serviceUpdate(service, itemHome);
+ atomFeedBuilder.serviceUpdate(service, itemHome);
} else {
if (AxisEvent.SERVICE_DEPLOY == event.getEventType()) {
- rssfiledBuilder.addService(service, item_home);
- atomFeedBuilder.addService(service, item_home);
+ rssFeedBuilder.addService(service, itemHome);
+ atomFeedBuilder.addService(service, itemHome);
} else if (AxisEvent.SERVICE_REMOVE == event.getEventType()) {
- rssfiledBuilder.removeService(service, item_home);
- atomFeedBuilder.removeService(service, item_home);
+ rssFeedBuilder.removeService(service, itemHome);
+ atomFeedBuilder.removeService(service, itemHome);
} else if (AxisEvent.SERVICE_START == event.getEventType()) {
- rssfiledBuilder.startService(service, item_home);
- atomFeedBuilder.startService(service, item_home);
+ rssFeedBuilder.startService(service, itemHome);
+ atomFeedBuilder.startService(service, itemHome);
} else if (AxisEvent.SERVICE_STOP == event.getEventType()) {
- rssfiledBuilder.stopService(service, item_home);
- atomFeedBuilder.stopService(service, item_home);
+ rssFeedBuilder.stopService(service, itemHome);
+ atomFeedBuilder.stopService(service, itemHome);
}
}
}
@@ -87,26 +87,26 @@
String value = (String) param.getValue();
MAX_ARRAY_SIZE = Integer.parseInt(value.trim());
}
- paramterInclude.addParameter(param);
+ parameterInclude.addParameter(param);
}
public void removeParameter(Parameter param) throws AxisFault {
- paramterInclude.removeParameter(param);
+ parameterInclude.removeParameter(param);
}
public void deserializeParameters(OMElement parameterElement) throws AxisFault {
- paramterInclude.deserializeParameters(parameterElement);
+ parameterInclude.deserializeParameters(parameterElement);
}
public Parameter getParameter(String name) {
- return paramterInclude.getParameter(name);
+ return parameterInclude.getParameter(name);
}
public ArrayList getParameters() {
- return paramterInclude.getParameters();
+ return parameterInclude.getParameters();
}
public boolean isParameterLocked(String parameterName) {
- return paramterInclude.isParameterLocked(parameterName);
+ return parameterInclude.isParameterLocked(parameterName);
}
}
Added: wsas/java/trunk/modules/core/src/org/wso2/wsas/util/AdminServicesFilter.java
==============================================================================
--- (empty file)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/util/AdminServicesFilter.java Wed Jan 24 03:24:56 2007
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed 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.wso2.wsas.util;
+
+import org.wso2.wsas.ServerConstants;
+
+/**
+ *
+ */
+public class AdminServicesFilter {
+
+ public static boolean isFiltered(String serviceGroupName) {
+ return ServerConstants.ADMINISTRATION_SERVICE_GROUP.equals(serviceGroupName) ||
+ serviceGroupName.endsWith(ServerConstants.STATISTICS_SERVICE_GROUP) ||
+ serviceGroupName.endsWith(ServerConstants.TRACER_SERVICE_GROUP) ||
+ serviceGroupName.startsWith(ServerConstants.CODEGEN_SERVICE_GROUP);
+ }
+}
Modified: wsas/java/trunk/modules/www/extensions/core/js/tracer.js
==============================================================================
--- wsas/java/trunk/modules/www/extensions/core/js/tracer.js (original)
+++ wsas/java/trunk/modules/www/extensions/core/js/tracer.js Wed Jan 24 03:24:56 2007
@@ -14,7 +14,7 @@
var body_xml = '<req:getMessageMonitoringStatusRequest xmlns:req="http://org.apache.axis2/xsd">\n' +
' </req:getMessageMonitoringStatusRequest>\n';
- var callURL = serverURL + "/" + "TracerAdmin" + "/" ;
+ var callURL = serverURL + "/" + "wso2tracer-admin" + "/" ;
send("getMessageMonitoringStatus", body_xml, "", callURL, "", false, loadMonitorSettingCallback);
}
@@ -55,7 +55,7 @@
' <req:onOff>' + value + '</req:onOff>\n' +
' </req:setTracingRequest>\n';
- var callURL = serverURL + "/" + "TracerAdmin" ;
+ var callURL = serverURL + "/" + "wso2tracer-admin" ;
monitoringStatus = value;
send("setTracing", body_xml, "", callURL,
document.getElementById("divSystemConfiguration"), false, setMonitoringCallback);
@@ -96,7 +96,7 @@
'<messages>1</messages>\n' +
'</req:getLastMessagesRequest>\n';
- var callURL = serverURL + "/" + "TracerService" ;
+ var callURL = serverURL + "/" + "wso2tracer" ;
send("getLastMessages", body_xml, "", callURL, "", false, viewTracerCallback);
}
@@ -132,7 +132,7 @@
'<messageSequence>' + message_sequence + '</messageSequence>\n' +
'</req:getMessageRequest>\n';
- var callURL = serverURL + "/" + "TracerService" ;
+ var callURL = serverURL + "/" + "wso2tracer" ;
send("getMessage", body_xml, "", callURL, "", false, loadTracerTextBoxes);
}
@@ -219,7 +219,7 @@
'<messages>30</messages>\n' +
'</req:getLastMessagesRequest>\n';
- var callURL = serverURL + "/" + "TracerService" ;
+ var callURL = serverURL + "/" + "wso2tracer" ;
send("getLastMessages", body_xml, "", callURL, "", false, loadTracerListCallback);
}
@@ -289,7 +289,7 @@
'</messageSequence>\n' +
'</req:getMessageRequest>\n';
- var callURL = serverURL + "/" + "TracerService" ;
+ var callURL = serverURL + "/" + "wso2tracer" ;
send("getMessage", body_xml, "", callURL, "", false, loadTracerTextBoxes);
}
}
Modified: wsas/java/trunk/pom.xml
==============================================================================
--- wsas/java/trunk/pom.xml (original)
+++ wsas/java/trunk/pom.xml Wed Jan 24 03:24:56 2007
@@ -279,12 +279,22 @@
<scope>test</scope>
</dependency>
+ <!-- Mex mar -->
<dependency>
<groupId>org.wso2.mex</groupId>
<artifactId>wso2mex</artifactId>
<version>${wso2mex.version}</version>
<type>mar</type>
</dependency>
+
+ <!-- XFer mar -->
+ <dependency>
+ <groupId>org.wso2.xfer</groupId>
+ <artifactId>wso2xfer</artifactId>
+ <version>${wso2xfer.version}</version>
+ <type>mar</type>
+ </dependency>
+
<!-- Statistics mar-->
<dependency>
<groupId>org.wso2.statistics</groupId>
@@ -703,27 +713,48 @@
<fileset>
<directory>modules/samples/Trader/src</directory>
<includes>
- <include>org/wso2/wsas/sample/trader/exchange/TraderExchangeCallbackHandler.java</include>
- <include>org/wso2/wsas/sample/trader/exchange/TraderExchangeStub.java</include>
- <include>org/wso2/wsas/sample/trader/exchange/TraderExchange.java</include>
- <include>org/wso2/wsas/sample/trader/exchange/TraderExchangeMessageReceiverInOnly.java</include>
- <include>org/wso2/wsas/sample/trader/exchange/TraderExchangeSkeletonInterface.java</include>
- <include>org/wso2/wsas/sample/trader/client/TraderClient.java</include>
- <include>org/wso2/wsas/sample/trader/client/TraderClientSkeletonInterface.java</include>
- <include>org/wso2/wsas/sample/trader/client/TraderClientMessageReceiverInOut.java</include>
- <include>org/wso2/wsas/sample/trader/client/TraderClientCallbackHandler.java</include>
- <include>org/wso2/wsas/sample/trader/client/TraderClientStub.java</include>
- <include>org/wso2/wsas/sample/exchange/trader/ExchangeTraderCallbackHandler.java</include>
- <include>org/wso2/wsas/sample/exchange/trader/ExchangeTraderStub.java</include>
- <include>org/wso2/wsas/sample/exchange/trader/ExchangeTrader.java</include>
- <include>org/wso2/wsas/sample/exchange/trader/ExchangeTraderMessageReceiverInOnly.java</include>
- <include>org/wso2/wsas/sample/exchange/trader/ExchangeTraderSkeletonInterface.java</include>
- <include>org/wso2/wsas/sample/exchange/trader/ExchangeTraderMessageReceiverInOut.java</include>
- <include>org/wso2/wsas/sample/exchange/client/ExchangeClientStub.java</include>
- <include>org/wso2/wsas/sample/exchange/client/ExchangeClient.java</include>
- <include>org/wso2/wsas/sample/exchange/client/ExchangeClientSkeletonInterface.java</include>
- <include>org/wso2/wsas/sample/exchange/client/ExchangeClientMessageReceiverInOut.java</include>
- <include>org/wso2/wsas/sample/exchange/client/ExchangeClientCallbackHandler.java</include>
+ <include>
+ org/wso2/wsas/sample/trader/exchange/TraderExchangeCallbackHandler.java</include>
+ <include>
+ org/wso2/wsas/sample/trader/exchange/TraderExchangeStub.java</include>
+ <include>
+ org/wso2/wsas/sample/trader/exchange/TraderExchange.java</include>
+ <include>
+ org/wso2/wsas/sample/trader/exchange/TraderExchangeMessageReceiverInOnly.java</include>
+ <include>
+ org/wso2/wsas/sample/trader/exchange/TraderExchangeSkeletonInterface.java</include>
+ <include>
+ org/wso2/wsas/sample/trader/client/TraderClient.java</include>
+ <include>
+ org/wso2/wsas/sample/trader/client/TraderClientSkeletonInterface.java</include>
+ <include>
+ org/wso2/wsas/sample/trader/client/TraderClientMessageReceiverInOut.java</include>
+ <include>
+ org/wso2/wsas/sample/trader/client/TraderClientCallbackHandler.java</include>
+ <include>
+ org/wso2/wsas/sample/trader/client/TraderClientStub.java</include>
+ <include>
+ org/wso2/wsas/sample/exchange/trader/ExchangeTraderCallbackHandler.java</include>
+ <include>
+ org/wso2/wsas/sample/exchange/trader/ExchangeTraderStub.java</include>
+ <include>
+ org/wso2/wsas/sample/exchange/trader/ExchangeTrader.java</include>
+ <include>
+ org/wso2/wsas/sample/exchange/trader/ExchangeTraderMessageReceiverInOnly.java</include>
+ <include>
+ org/wso2/wsas/sample/exchange/trader/ExchangeTraderSkeletonInterface.java</include>
+ <include>
+ org/wso2/wsas/sample/exchange/trader/ExchangeTraderMessageReceiverInOut.java</include>
+ <include>
+ org/wso2/wsas/sample/exchange/client/ExchangeClientStub.java</include>
+ <include>
+ org/wso2/wsas/sample/exchange/client/ExchangeClient.java</include>
+ <include>
+ org/wso2/wsas/sample/exchange/client/ExchangeClientSkeletonInterface.java</include>
+ <include>
+ org/wso2/wsas/sample/exchange/client/ExchangeClientMessageReceiverInOut.java</include>
+ <include>
+ org/wso2/wsas/sample/exchange/client/ExchangeClientCallbackHandler.java</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
@@ -732,21 +763,28 @@
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
- <directory>modules/samples/CommodityQuote/src/org/wso2/www</directory>
+ <directory>
+ modules/samples/CommodityQuote/src/org/wso2/www</directory>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
- <directory>modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/mapper</directory>
+ <directory>
+ modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/mapper</directory>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>modules/samples/CommodityQuote/src</directory>
<includes>
- <include>org/wso2/wsas/sample/commodityquote/services/CommodityQuoteSkeletonInterface.java</include>
- <include>org/wso2/wsas/sample/commodityquote/services/CommodityQuoteMessageReceiverInOut.java</include>
- <include>org/wso2/wsas/sample/commodityquote/client/CommodityQuoteStub.java</include>
- <include>org/wso2/wsas/sample/commodityquote/client/CommodityQuote.java</include>
- <include>org/wso2/wsas/sample/commodityquote/client/CommodityQuoteCallbackHandler.java</include>
+ <include>
+ org/wso2/wsas/sample/commodityquote/services/CommodityQuoteSkeletonInterface.java</include>
+ <include>
+ org/wso2/wsas/sample/commodityquote/services/CommodityQuoteMessageReceiverInOut.java</include>
+ <include>
+ org/wso2/wsas/sample/commodityquote/client/CommodityQuoteStub.java</include>
+ <include>
+ org/wso2/wsas/sample/commodityquote/client/CommodityQuote.java</include>
+ <include>
+ org/wso2/wsas/sample/commodityquote/client/CommodityQuoteCallbackHandler.java</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
@@ -758,15 +796,23 @@
<directory>modules/admin</directory>
<includes>
<include>build.xml</include>
- <include>test/org/wso2/wsas/admin/service/logging/LoggingServiceStub.java</include>
+ <include>
+ test/org/wso2/wsas/admin/service/logging/LoggingServiceStub.java</include>
<include>conf/wso2wsas.jks</include>
- <include>src/org/wso2/wsas/admin/service/logging/LoggingServiceMessageReceiverInOut.java</include>
- <include>src/org/wso2/wsas/admin/service/logging/ExtensionMapper.java</include>
- <include>src/org/wso2/wsas/admin/service/logging/GetLogsResponse.java</include>
- <include>src/org/wso2/wsas/admin/service/logging/LoggingServiceSkeletonInterface.java</include>
- <include>src/org/wso2/wsas/admin/service/logging/GetLogsRequest.java</include>
- <include>test-resources/repository/modules/addressing-1.1.1-SNAPSHOT.mar</include>
- <include>test-resources/repository/modules/wso2throttle-1.2-SNAPSHOT.mar</include>
+ <include>
+ src/org/wso2/wsas/admin/service/logging/LoggingServiceMessageReceiverInOut.java</include>
+ <include>
+ src/org/wso2/wsas/admin/service/logging/ExtensionMapper.java</include>
+ <include>
+ src/org/wso2/wsas/admin/service/logging/GetLogsResponse.java</include>
+ <include>
+ src/org/wso2/wsas/admin/service/logging/LoggingServiceSkeletonInterface.java</include>
+ <include>
+ src/org/wso2/wsas/admin/service/logging/GetLogsRequest.java</include>
+ <include>
+ test-resources/repository/modules/addressing-1.1.1-SNAPSHOT.mar</include>
+ <include>
+ test-resources/repository/modules/wso2throttle-1.2-SNAPSHOT.mar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
@@ -805,6 +851,7 @@
<wso2utils.version>1.2-SNAPSHOT</wso2utils.version>
<wso2codegen.version>1.2-SNAPSHOT</wso2codegen.version>
<wso2mex.version>1.2-SNAPSHOT</wso2mex.version>
+ <wso2xfer.version>1.2-SNAPSHOT</wso2xfer.version>
<wso2statistics.version>1.2-SNAPSHOT</wso2statistics.version>
<wso2throttle.version>1.2-SNAPSHOT</wso2throttle.version>
<wso2tracer.version>1.2-SNAPSHOT</wso2tracer.version>
More information about the Wsas-java-dev
mailing list