diff --git a/services/additions/WEB-INF/classes/README.txt b/services/additions/WEB-INF/classes/README.txt
deleted file mode 100644
index e783a08f9..000000000
--- a/services/additions/WEB-INF/classes/README.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-bdc34:
-This directory is here so that we can stick properties files
-and other resources into a directory that will end up on
-the java CLASSPATH.
-
-Files for apache axis:
- -rw-r--r-- 1 bdc34 bdc34 9355 Aug 14 12:13 i18n_ja.properties
- -rw-r--r-- 1 bdc34 bdc34 4799 Aug 14 12:13 i18n.properties
- -rw-rw-r-- 1 bdc34 bdc34 921 Aug 14 12:32 log4j.properties
-
-It seems like the log4j.properties file may cause problems if
-we start using log4j in other parts of the system.
diff --git a/services/additions/WEB-INF/classes/i18n.properties b/services/additions/WEB-INF/classes/i18n.properties
deleted file mode 100644
index 8b1deba2e..000000000
--- a/services/additions/WEB-INF/classes/i18n.properties
+++ /dev/null
@@ -1,132 +0,0 @@
-############################################################
-# i18n settings for the Axis Web-Application
-#
-
-#################### [i18n global setting] #################
-#
-locales=en ja
-
-#################### [index.jsp] ###########################
-#
-
-### Header ###
-#
-language=Language
-welcomeMessage=Hello! Welcome to Apache-Axis.
-
-### Operation list ###
-#
-operationType=What do you want to do today?
-
-# Validation
-validation=Validation
-validationURL=happyaxis.jsp
-validationFootnote00=Validate the local installation's configuration
-validationFootnote01=see below if this does not work.
-
-# List
-serviceList=List
-serviceListURL=servlet/AxisServlet
-serviceListFootnote=View the list of deployed Web services
-
-# Call
-callAnEndpoint=Call
-callAnEndpointURL=EchoHeaders.jws?method=list
-callAnEndpointFootnote00=Call a local endpoint that list's the caller's http headers
-callAnEndpointFootnote01=(or see its WSDL).
-
-# Visit
-visit=Visit
-visitURL=http://ws.apache.org/axis/
-visitFootnote=Visit the Apache-Axis Home Page
-
-# Admin
-admin=Administer Axis
-adminURL=servlet/AdminServlet
-adminFootnote=[disabled by default for security reasons]
-
-# SOAPMonitor
-soapMonitor=SOAPMonitor
-soapMonitorURL=SOAPMonitor
-soapMonitorFootnote=[disabled by default for security reasons]
-
-# Sidenote
-sideNote=To enable the disabled features, uncomment the appropriate declarations in WEB-INF/web.xml in the webapplication and restart it.
-
-### Validating Axis ###
-#
-
-# Title
-validatingAxis=Validating Axis
-
-# Note 0
-validationNote00=If the "happyaxis" validation page displays an exception instead of a status page, the likely cause is that you have multiple XML parsers in your classpath. Clean up your classpath by eliminating extraneous parsers.
-
-# Note 1
-validationNote01=If you have problems getting Axis to work, consult the Axis Wiki and then try the Axis user mailing list.
-
-#
-#################### [index.jsp] ###########################
-
-#################### [happyaxis.jsp] #######################
-#
-
-pageTitle=Axis Happiness Page
-pageRole=Examining webapp configuration
-
-### Needed Components ###
-#
-neededComponents=Needed Components
-error=Error
-warning=Warning
-criticalErrorMessage=Axis will not work.
-uncertainErrorMessage=Axis may not work.
-# parameters = url, name
-seeHomepage=
See {0}
-# parameters = category, classname, jarFile, errorText, url
-couldNotFound= {0}: could not find class {1} from file {2}
{3} {4}
-# parameters = description, classname
-foundClass00=Found {0} ( {1} )
-# parameters = description, classname
-foundClass01=Found {0} ( {1} ) at {2}
-# parameters = category, classname, errorText, url
-couldNotFoundDep=
{0}: could not find a dependency of class {1} from file {2}
{3} {4}
-# parameters = ncdfe.getMessage(), classname
-theRootCause=
The root cause was: {0}
This can happen e.g. if {1} is in the 'common' classpath, but a dependency like activation.jar is only in the webapp classpath.
-# parameters = location
-invalidSAAJ=Error: Invalid version of SAAJ API found in {0}. Make sure that Axis' saaj.jar precedes {0} in CLASSPATH.
-axisInstallation=Axis installation instructions
-
-### Optional Components ###
-#
-
-optionalComponents=Optional Components
-attachmentsError=Attachments will not work.
-xmlSecurityError=XML Security is not supported.
-httpsError=https is not supported.
-
-happyResult00=The core axis libraries are present.
-happyResult01=The optional components are present.
-# parameters = needed(num of missing libraries)
-unhappyResult00={0} core axis library(ies) are missing
-# parameters = wanted(num of missing libraries)
-unhappyResult01={0} wanted optional axis librar(ies) are missing
-
-hintString=Note: On Tomcat 4.x and Java1.4, you may need to put libraries that contain java.* or javax.* packages into CATALINA_HOME/common/lib
jaxrpc.jar and saaj.jar are two such libraries.
-noteString=Note: Even if everything this page probes for is present, there is no guarantee your web service will work, because there are many configuration options that we do not check for. These tests are necessary but not sufficient
-
-### Examining Application Server ###
-#
-apsExamining=Examining Application Server
-recommendedParser=We recommend Xerces 2 over Crimson as the XML parser for Axis
-couldNotCreateParser=Could not create an XML Parser
-
-### Examining System Properties ###
-#
-sysExamining=Examining System Properties
-sysPropError=System properties are not accessible.
-classFoundError=an unknown location
-apsPlatform=Platform
-
-#
-#################### [happyaxis.jsp] #######################
\ No newline at end of file
diff --git a/services/additions/WEB-INF/classes/i18n_ja.properties b/services/additions/WEB-INF/classes/i18n_ja.properties
deleted file mode 100644
index 91fb3cf14..000000000
--- a/services/additions/WEB-INF/classes/i18n_ja.properties
+++ /dev/null
@@ -1,127 +0,0 @@
-############################################################
-# Japanese settings for the Axis Web-Application
-#
-
-#################### [index.jsp] ###########################
-#
-
-### Header ###
-#
-language=\u8a00\u8a9e
-welcomeMessage=\u3053\u3093\u306b\u3061\u306f\uff01 Apache-Axis\u3078\u3088\u3046\u3053\u305d
-
-### Operation list ###
-#
-operationType=\u4eca\u65e5\u306f\u4f55\u3092\u3057\u305f\u3044\u3067\u3059\u304b\uff1f
-
-# Validation
-validation=\u691c\u8a3c
-validationURL=happyaxis.jsp
-validationFootnote00=\u30ed\u30fc\u30ab\u30eb\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u72b6\u6cc1\u3092\u691c\u8a3c\u3059\u308b
-validationFootnote01=\u3046\u307e\u304f\u6a5f\u80fd\u3057\u306a\u3044\u5834\u5408\u306f\u3001\u4e0b\u8a18\u300cAxis\u306e\u691c\u8a3c\u300d\u3092\u53c2\u7167
-
-# List
-serviceList=\u30ea\u30b9\u30c8
-serviceListURL=servlet/AxisServlet
-serviceListFootnote=\u30c7\u30d7\u30ed\u30a4\u6e08\u307f\u306eWeb\u30b5\u30fc\u30d3\u30b9\u30ea\u30b9\u30c8\u3092\u898b\u308b
-
-# Call
-callAnEndpoint=\u547c\u51fa\u3057
-callAnEndpointURL=EchoHeaders.jws?method=list
-callAnEndpointFootnote00=HTTP\u30d8\u30c3\u30c0\u306e\u4e00\u89a7\u8868\u793a\u3092\u884c\u3046\u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8\u3092\u8d77\u52d5\u3059\u308b
-callAnEndpointFootnote01=(\u3082\u3057\u304f\u306fWSDL\u306e\u53c2\u7167)
-
-# Visit
-visit=\u8a2a\u554f
-visitURL=http://ws.apache.org/axis/ja/index.html
-visitFootnote=Apache Axis\u30db\u30fc\u30e0\u30da\u30fc\u30b8\u3092\u8a2a\u554f\u3059\u308b
-
-# Admin
-admin=Axis\u306e\u7ba1\u7406
-adminURL=servlet/AdminServlet
-adminFootnote=[\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u4e0a\u306e\u7406\u7531\u304b\u3089\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u306f\u5229\u7528\u4e0d\u53ef]
-
-# SOAPMonitor
-soapMonitor=SOAP\u30e2\u30cb\u30bf
-soapMonitorURL=SOAPMonitor
-soapMonitorFootnote=[\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u4e0a\u306e\u7406\u7531\u304b\u3089\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u306f\u5229\u7528\u4e0d\u53ef]
-
-# Sidenote
-sideNote=\u4e0a\u8a18\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u5229\u7528\u3067\u304d\u306a\u3044\u6a5f\u80fd\u3092\u6709\u52b9\u306b\u3059\u308b\u306b\u306f\u3001web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u5185\u306eWEB-INF/web.xml\u30d5\u30a1\u30a4\u30eb\u306e\u8a72\u5f53\u3059\u308b\u5ba3\u8a00\u306e\u30b3\u30e1\u30f3\u30c8\u3092\u5916\u3057\u3001\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u518d\u8d77\u52d5\u3057\u3066\u4e0b\u3055\u3044\u3002
-
-### Validating Axis ###
-#
-
-# Title
-validatingAxis=Axis\u306e\u691c\u8a3c
-
-# Note 0
-validationNote00="happyaxis"\u691c\u8a3c\u30da\u30fc\u30b8\u304c\u72b6\u614b\u8868\u793a\u3067\u306f\u306a\u304f\u4f8b\u5916\u3092\u8868\u793a\u3059\u308b\u5834\u5408\u3001\u539f\u56e0\u3068\u3057\u3066\u306f\u30af\u30e9\u30b9\u30d1\u30b9\u5185\u306b\u8907\u6570\u306eXML\u30d1\u30fc\u30b5\u3092\u6307\u5b9a\u3057\u3066\u3044\u308b\u3053\u3068\u304c\u8003\u3048\u3089\u308c\u307e\u3059\u3002\u95a2\u4fc2\u306a\u3044\u30d1\u30fc\u30b5\u3092\u30af\u30e9\u30b9\u30d1\u30b9\u304b\u3089\u53d6\u308a\u9664\u3044\u3066\u307f\u3066\u4e0b\u3055\u3044\u3002
-
-# Note 1
-validationNote01=Axis\u3092\u52d5\u4f5c\u3055\u305b\u308b\u4e0a\u3067\u554f\u984c\u3092\u62b1\u3048\u3066\u3044\u308b\u5834\u5408\u306f\u3001\u307e\u305aAxis Wiki\u3092\u53c2\u8003\u306b\u3057\u3001\u305d\u306e\u5f8c\u3067Axis\u30e6\u30fc\u30b6\u30e1\u30fc\u30ea\u30f3\u30b0\u30ea\u30b9\u30c8\u306b\u6295\u7a3f\u3057\u3066\u307f\u3066\u4e0b\u3055\u3044\u3002
-
-#
-#################### [index.jsp] ###########################
-
-#################### [happyaxis.jsp] #######################
-#
-pageTitle=Axis Happiness Page
-pageRole=webapp\u306e\u69cb\u6210\u306b\u95a2\u3059\u308b\u8abf\u67fb
-
-### Needed Components ###
-#
-neededComponents=\u5fc5\u9808\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8
-error=\u30a8\u30e9\u30fc
-warning=\u8b66\u544a
-criticalErrorMessage=\u304a\u305d\u3089\u304fAxis\u306f\u52d5\u304d\u307e\u305b\u3093\u3002
-uncertainErrorMessage=Axis\u306f\u52d5\u304b\u306a\u3044\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002
-# parameters = url, name
-seeHomepage=
{0}\u3092\u898b\u3066\u4e0b\u3055\u3044\u3002
-# parameters = category, classname, jarFile, errorText, url
-couldNotFound=
{0}: {2}\u30d5\u30a1\u30a4\u30eb\u304c\u63d0\u4f9b\u3059\u308b{1}\u30af\u30e9\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
{3} {4}
-# parameters = description, classname
-foundClass00={0} ( {1} ) \u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002
-# parameters = description, classname, location
-foundClass01={0} ( {1} ) \u304c{2}\u3067\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002
-# parameters = category, classname, errorText, url
-couldNotFoundDep=
{0}: {2}\u30d5\u30a1\u30a4\u30eb\u304c\u63d0\u4f9b\u3059\u308b{1}\u30af\u30e9\u30b9\u306e\u4f9d\u5b58\u95a2\u4fc2\u304c\u89e3\u6c7a\u3067\u304d\u307e\u305b\u3093\u3002
{3} {4}
-# parameters = ncdfe.getMessage(), classname
-theRootCause=
\u6839\u672c\u539f\u56e0: {0}
\u3053\u306e\u30a8\u30e9\u30fc\u306f\u6b21\u306e\u3088\u3046\u306a\u5834\u5408\u306b\u767a\u751f\u3059\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002\u300c\u5171\u901a\u306e\u300d\u30af\u30e9\u30b9\u30d1\u30b9\u306b{1}\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u308b\u306b\u3082\u304b\u304b\u308f\u3089\u305a\u3001activation.jar \u306e\u3088\u3046\u306a\u4f9d\u5b58\u3059\u308b\u30e9\u30a4\u30d6\u30e9\u30ea\u304cwebapp\u306e\u30af\u30e9\u30b9\u30d1\u30b9\u3060\u3051\u306b\u3057\u304b\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u306a\u3044\u3088\u3046\u306a\u5834\u5408\u3067\u3059\u3002
-# parameters = location
-invalidSAAJ=\u30a8\u30e9\u30fc: {0}\u306b\u9069\u5207\u3067\u306a\u3044\u30d0\u30fc\u30b8\u30e7\u30f3\u306eSAAJ API\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002Axis\u306esaaj.jar\u3092\u3001CLASSPATH\u306b\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u308b{0} \u3088\u308a\u3082\u524d\u65b9\u306b\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-axisInstallation=Axis\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u624b\u9806
-
-### Optional Components ###
-#
-optionalComponents=\u30aa\u30d7\u30b7\u30e7\u30ca\u30eb\uff65\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8
-attachmentsError=\u304a\u305d\u3089\u304fAttachments\u306f\u6a5f\u80fd\u3057\u307e\u305b\u3093\u3002
-xmlSecurityError=XML Security\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u307e\u305b\u3093\u3002
-httpsError=https\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u307e\u305b\u3093\u3002
-
-happyResult00=axis\u306e\u30b3\u30a2\uff65\u30e9\u30a4\u30d6\u30e9\u30ea\u306f\u5168\u3066\u5b58\u5728\u3057\u3066\u3044\u307e\u3059\u3002
-happyResult01=\u30aa\u30d7\u30b7\u30e7\u30ca\u30eb\uff65\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u306f\u5b58\u5728\u3057\u3066\u3044\u307e\u3059\u3002
-# parameters = needed(num of missing libraries)
-unhappyResult00=axis\u306e\u30b3\u30a2\uff65\u30e9\u30a4\u30d6\u30e9\u30ea\u304c{0}\u3064\u6b20\u3051\u3066\u3044\u307e\u3059\u3002
-# parameters = wanted(num of missing libraries)
-unhappyResult01=axis\u306e\u30aa\u30d7\u30b7\u30e7\u30ca\u30eb\uff65\u30e9\u30a4\u30d6\u30e9\u30ea\u304c{0}\u3064\u6b20\u3051\u3066\u3044\u307e\u3059\u3002
-
-hintString=\u6ce8\u610f: Tomcat 4.x \u3068 Java1.4 \u4e0a\u3067\u306f\u3001CATALINA_HOME/common/lib \u306b\u3001java.* \u3082\u3057\u304f\u306f javax.* \u30d1\u30c3\u30b1\u30fc\u30b8\u3092\u542b\u3080\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u914d\u7f6e\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
\u4f8b\u3048\u3070 jaxrpc.jar \u3068 saaj.jar \u306f\u3001\u305d\u306e\u3088\u3046\u306a\u30e9\u30a4\u30d6\u30e9\u30ea\u3067\u3059\u3002
-noteString=\u6ce8\u610f: \u30da\u30fc\u30b8\u306b\u5168\u3066\u306e\u8abf\u67fb\u7d50\u679c\u304c\u8868\u793a\u3055\u308c\u305f\u3068\u3057\u3066\u3082\u3001\u30c1\u30a7\u30c3\u30af\u3067\u304d\u306a\u3044\u69cb\u6210\u30aa\u30d7\u30b7\u30e7\u30f3\u3082\u591a\u3044\u305f\u3081\u3001\u3042\u306a\u305f\u306eWeb\u30b5\u30fc\u30d3\u30b9\u304c\u6b63\u5e38\u306b\u6a5f\u80fd\u3059\u308b\u4fdd\u969c\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u3053\u308c\u3089\u306e\u30c6\u30b9\u30c8\u306f\u5fc5\u8981\u306a\u3082\u306e\u3067\u3059\u304c\u3001\u5341\u5206\u306a\u3082\u306e\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
-
-### Examining Application Server ###
-#
-apsExamining=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\uff65\u30b5\u30fc\u30d0\u30fc\u306b\u95a2\u3059\u308b\u8abf\u67fb
-recommendedParser=Axis\u3067\u4f7f\u7528\u3059\u308bXML\u30d1\u30fc\u30b5\u30fc\u306b\u306f Crimson \u3067\u306f\u306a\u304f\u3001Xerces 2 \u3092\u63a8\u5968\u3057\u3066\u3044\u307e\u3059\u3002
-couldNotCreateParser=XML Parser\u3092\u751f\u6210\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002
-
-### Examining System Properties ###
-#
-sysExamining=\u30b7\u30b9\u30c6\u30e0\uff65\u30d7\u30ed\u30d1\u30c6\u30a3\u306b\u95a2\u3059\u308b\u8abf\u67fb
-sysPropError=\u30b7\u30b9\u30c6\u30e0\uff65\u30d7\u30ed\u30d1\u30c6\u30a3\u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u307e\u305b\u3093\u3002
-
-classFoundError=\u4e0d\u660e\u306a\u5834\u6240
-apsPlatform=\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0
-
-#
-#################### [happyaxis.jsp] #######################
diff --git a/services/additions/WEB-INF/classes/log4j.properties b/services/additions/WEB-INF/classes/log4j.properties
deleted file mode 100644
index 3ca86f404..000000000
--- a/services/additions/WEB-INF/classes/log4j.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# Set root category priority to INFO and its only appender to CONSOLE.
-log4j.rootCategory=INFO, CONSOLE
-#log4j.rootCategory=INFO, CONSOLE, LOGFILE
-
-# Set the enterprise logger category to FATAL and its only appender to CONSOLE.
-log4j.logger.org.apache.axis.enterprise=FATAL, CONSOLE
-
-# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.Threshold=INFO
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=- %m%n
-
-# LOGFILE is set to be a File appender using a PatternLayout.
-log4j.appender.LOGFILE=org.apache.log4j.FileAppender
-log4j.appender.LOGFILE.File=axis.log
-log4j.appender.LOGFILE.Append=true
-log4j.appender.LOGFILE.Threshold=INFO
-log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOGFILE.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
diff --git a/services/additions/admin/axis/SOAPMonitorApplet.java b/services/additions/admin/axis/SOAPMonitorApplet.java
deleted file mode 100644
index 08b0ce1cd..000000000
--- a/services/additions/admin/axis/SOAPMonitorApplet.java
+++ /dev/null
@@ -1,1482 +0,0 @@
-/*
- * Copyright 2001,2004 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.
- */
-
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.net.*;
-import java.text.*;
-import java.util.*;
-import javax.swing.*;
-import javax.swing.border.*;
-import javax.swing.event.*;
-import javax.swing.table.*;
-
-import org.apache.axis.monitor.SOAPMonitorConstants;
-
-/**
- * This is a SOAP Mointor Applet class. This class provides
- * the user interface for displaying data from the SOAP
- * monitor service.
- *
- * @author Brian Price (pricebe@us.ibm.com)
- *
- */
-public class SOAPMonitorApplet extends JApplet {
-
- /**
- * Private data
- */
- private JPanel main_panel = null;
- private JTabbedPane tabbed_pane = null;
- private int port = 0;
- private Vector pages = null;
-
- /**
- * Constructor
- */
- public SOAPMonitorApplet() {
- }
-
- /**
- * Applet initialization
- */
- public void init() {
- // Get the port to be used
- String port_str = getParameter("port");
- if (port_str != null) {
- port = Integer.parseInt(port_str);
- }
- // Try to use the system look and feel
- try {
- UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
- } catch (Exception e){
- }
- // Create main panel to hold notebook
- main_panel = new JPanel();
- main_panel.setBackground(Color.white);
- main_panel.setLayout(new BorderLayout());
- setContentPane(main_panel);
- // Create the notebook
- tabbed_pane = new JTabbedPane(JTabbedPane.TOP);
- main_panel.add(tabbed_pane,BorderLayout.CENTER);
- // Add notebook page for default host connection
- pages = new Vector();
- addPage(new SOAPMonitorPage(getCodeBase().getHost()));
- }
-
- /**
- * Add a page to the notebook
- */
- private void addPage(SOAPMonitorPage pg) {
- tabbed_pane.addTab(" "+pg.getHost()+" ", pg);
- pages.addElement(pg);
- }
-
- /**
- * Applet is being displayed
- */
- public void start() {
- // Tell all pages to start talking to the server
- Enumeration e = pages.elements();
- while (e.hasMoreElements()) {
- SOAPMonitorPage pg = (SOAPMonitorPage) e.nextElement();
- if (pg != null) {
- pg.start();
- }
- }
- }
-
- /*
- * Applet is no longer displayed
- */
- public void stop() {
- // Tell all pages to stop talking to the server
- Enumeration e = pages.elements();
- while (e.hasMoreElements()) {
- SOAPMonitorPage pg = (SOAPMonitorPage) e.nextElement();
- if (pg != null) {
- pg.stop();
- }
- }
- }
-
- /**
- * Applet cleanup
- */
- public void destroy() {
- tabbed_pane = null;
- main_panel = null;
- }
-
- /**
- * This class provides the contents of a notebook page
- * representing a server connection.
- */
- class SOAPMonitorPage extends JPanel
- implements Runnable,
- ListSelectionListener,
- ActionListener {
-
- /**
- * Status Strings
- */
- private final String STATUS_ACTIVE = "The SOAP Monitor is started.";
- private final String STATUS_STOPPED = "The SOAP Monitor is stopped.";
- private final String STATUS_CLOSED = "The server communication has been terminated.";
- private final String STATUS_NOCONNECT = "The SOAP Monitor is unable to communcate with the server.";
-
- /**
- * Private data
- */
- private String host = null;
- private Socket socket = null;
- private ObjectInputStream in = null;
- private ObjectOutputStream out = null;
- private SOAPMonitorTableModel model = null;
- private JTable table = null;
- private JScrollPane scroll = null;
- private JPanel list_panel = null;
- private JPanel list_buttons = null;
- private JButton remove_button = null;
- private JButton remove_all_button = null;
- private JButton filter_button = null;
- private JPanel details_panel = null;
- private JPanel details_header = null;
- private JSplitPane details_soap = null;
- private JPanel details_buttons = null;
- private JLabel details_time = null;
- private JLabel details_target = null;
- private JLabel details_status = null;
- private JLabel details_time_value = null;
- private JLabel details_target_value = null;
- private JLabel details_status_value = null;
- private EmptyBorder empty_border = null;
- private EtchedBorder etched_border = null;
- private JPanel request_panel = null;
- private JPanel response_panel = null;
- private JLabel request_label = null;
- private JLabel response_label = null;
- private SOAPMonitorTextArea request_text = null;
- private SOAPMonitorTextArea response_text = null;
- private JScrollPane request_scroll = null;
- private JScrollPane response_scroll = null;
- private JButton layout_button = null;
- private JSplitPane split = null;
- private JPanel status_area = null;
- private JPanel status_buttons = null;
- private JButton start_button = null;
- private JButton stop_button = null;
- private JLabel status_text = null;
- private JPanel status_text_panel = null;
- private SOAPMonitorFilter filter = null;
- private GridBagLayout details_header_layout = null;
- private GridBagConstraints details_header_constraints = null;
- private JCheckBox reflow_xml = null;
-
- /**
- * Constructor (create and layout page)
- */
- public SOAPMonitorPage(String host_name) {
- host = host_name;
- // Set up default filter (show all messages)
- filter = new SOAPMonitorFilter();
- // Use borders to help improve appearance
- etched_border = new EtchedBorder();
- // Build top portion of split (list panel)
- model = new SOAPMonitorTableModel();
- table = new JTable(model);
- table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- table.setRowSelectionInterval(0,0);
- table.setPreferredScrollableViewportSize(new Dimension(600, 96));
- table.getSelectionModel().addListSelectionListener(this);
- scroll = new JScrollPane(table);
- remove_button = new JButton("Remove");
- remove_button.addActionListener(this);
- remove_button.setEnabled(false);
- remove_all_button = new JButton("Remove All");
- remove_all_button.addActionListener(this);
- filter_button = new JButton("Filter ...");
- filter_button.addActionListener(this);
- list_buttons = new JPanel();
- list_buttons.setLayout(new FlowLayout());
- list_buttons.add(remove_button);
- list_buttons.add(remove_all_button);
- list_buttons.add(filter_button);
- list_panel = new JPanel();
- list_panel.setLayout(new BorderLayout());
- list_panel.add(scroll,BorderLayout.CENTER);
- list_panel.add(list_buttons, BorderLayout.SOUTH);
- list_panel.setBorder(empty_border);
- // Build bottom portion of split (message details)
- details_time = new JLabel("Time: ", SwingConstants.RIGHT);
- details_target = new JLabel("Target Service: ", SwingConstants.RIGHT);
- details_status = new JLabel("Status: ", SwingConstants.RIGHT);
- details_time_value = new JLabel();
- details_target_value = new JLabel();
- details_status_value = new JLabel();
- Dimension preferred_size = details_time.getPreferredSize();
- preferred_size.width = 1;
- details_time.setPreferredSize(preferred_size);
- details_target.setPreferredSize(preferred_size);
- details_status.setPreferredSize(preferred_size);
- details_time_value.setPreferredSize(preferred_size);
- details_target_value.setPreferredSize(preferred_size);
- details_status_value.setPreferredSize(preferred_size);
- details_header = new JPanel();
- details_header_layout = new GridBagLayout();
- details_header.setLayout(details_header_layout);
- details_header_constraints = new GridBagConstraints();
- details_header_constraints.fill=GridBagConstraints.BOTH;
- details_header_constraints.weightx=0.5;
- details_header_layout.setConstraints(details_time,details_header_constraints);
- details_header.add(details_time);
- details_header_layout.setConstraints(details_time_value,details_header_constraints);
- details_header.add(details_time_value);
- details_header_layout.setConstraints(details_target,details_header_constraints);
- details_header.add(details_target);
- details_header_constraints.weightx=1.0;
- details_header_layout.setConstraints(details_target_value,details_header_constraints);
- details_header.add(details_target_value);
- details_header_constraints.weightx=.5;
- details_header_layout.setConstraints(details_status,details_header_constraints);
- details_header.add(details_status);
- details_header_layout.setConstraints(details_status_value,details_header_constraints);
- details_header.add(details_status_value);
- details_header.setBorder(etched_border);
- request_label = new JLabel("SOAP Request", SwingConstants.CENTER);
- request_text = new SOAPMonitorTextArea();
- request_text.setEditable(false);
- request_scroll = new JScrollPane(request_text);
- request_panel = new JPanel();
- request_panel.setLayout(new BorderLayout());
- request_panel.add(request_label, BorderLayout.NORTH);
- request_panel.add(request_scroll, BorderLayout.CENTER);
- response_label = new JLabel("SOAP Response", SwingConstants.CENTER);
- response_text = new SOAPMonitorTextArea();
- response_text.setEditable(false);
- response_scroll = new JScrollPane(response_text);
- response_panel = new JPanel();
- response_panel.setLayout(new BorderLayout());
- response_panel.add(response_label, BorderLayout.NORTH);
- response_panel.add(response_scroll, BorderLayout.CENTER);
- details_soap = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
- details_soap.setTopComponent(request_panel);
- details_soap.setRightComponent(response_panel);
- details_soap.setResizeWeight(.5);
- details_panel = new JPanel();
- layout_button = new JButton("Switch Layout");
- layout_button.addActionListener(this);
- reflow_xml = new JCheckBox("Reflow XML text");
- reflow_xml.addActionListener(this);
- details_buttons = new JPanel();
- details_buttons.setLayout(new FlowLayout());
- details_buttons.add(reflow_xml);
- details_buttons.add(layout_button);
- details_panel.setLayout(new BorderLayout());
- details_panel.add(details_header,BorderLayout.NORTH);
- details_panel.add(details_soap,BorderLayout.CENTER);
- details_panel.add(details_buttons,BorderLayout.SOUTH);
- details_panel.setBorder(empty_border);
- // Add the two parts to the age split pane
- split = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
- split.setTopComponent(list_panel);
- split.setRightComponent(details_panel);
- // Build status area
- start_button = new JButton("Start");
- start_button.addActionListener(this);
- stop_button = new JButton("Stop");
- stop_button.addActionListener(this);
- status_buttons = new JPanel();
- status_buttons.setLayout(new FlowLayout());
- status_buttons.add(start_button);
- status_buttons.add(stop_button);
- status_text = new JLabel();
- status_text.setBorder(new BevelBorder(BevelBorder.LOWERED));
- status_text_panel = new JPanel();
- status_text_panel.setLayout(new BorderLayout());
- status_text_panel.add(status_text, BorderLayout.CENTER);
- status_text_panel.setBorder(empty_border);
- status_area = new JPanel();
- status_area.setLayout(new BorderLayout());
- status_area.add(status_buttons, BorderLayout.WEST);
- status_area.add(status_text_panel, BorderLayout.CENTER);
- status_area.setBorder(etched_border);
- // Add the split and status area to page
- setLayout(new BorderLayout());
- add(split, BorderLayout.CENTER);
- add(status_area, BorderLayout.SOUTH);
- }
-
- /**
- * Get the name of the host we are displaying
- */
- public String getHost() {
- return host;
- }
-
- /**
- * Set the status text
- */
- public void setStatus(String txt) {
- status_text.setForeground(Color.black);
- status_text.setText(" "+txt);
- }
-
- /**
- * Set the status text to an error
- */
- public void setErrorStatus(String txt) {
- status_text.setForeground(Color.red);
- status_text.setText(" "+txt);
- }
-
- /**
- * Start talking to the server
- */
- public void start() {
- String codehost = getCodeBase().getHost();
- if (socket == null) {
- try {
- // Open the socket to the server
- socket = new Socket(codehost, port);
- // Create output stream
- out = new ObjectOutputStream(socket.getOutputStream());
- out.flush();
- // Create input stream and start background
- // thread to read data from the server
- in = new ObjectInputStream(socket.getInputStream());
- new Thread(this).start();
- } catch (Exception e) {
- // Exceptions here are unexpected, but we can't
- // really do anything (so just write it to stdout
- // in case someone cares and then ignore it)
- System.out.println("Exception! "+e.toString());
- e.printStackTrace();
- setErrorStatus(STATUS_NOCONNECT);
- socket = null;
- }
- } else {
- // Already started
- }
- if (socket != null) {
- // Make sure the right buttons are enabled
- start_button.setEnabled(false);
- stop_button.setEnabled(true);
- setStatus(STATUS_ACTIVE);
- }
- }
-
- /**
- * Stop talking to the server
- */
- public void stop() {
- if (socket != null) {
- // Close all the streams and socket
- if (out != null) {
- try {
- out.close();
- } catch (IOException ioe) {
- }
- out = null;
- }
- if (in != null) {
- try {
- in.close();
- } catch (IOException ioe) {
- }
- in = null;
- }
- if (socket != null) {
- try {
- socket.close();
- } catch (IOException ioe) {
- }
- socket = null;
- }
- } else {
- // Already stopped
- }
- // Make sure the right buttons are enabled
- start_button.setEnabled(true);
- stop_button.setEnabled(false);
- setStatus(STATUS_STOPPED);
- }
-
- /**
- * Background thread used to receive data from
- * the server.
- */
- public void run() {
- Long id;
- Integer message_type;
- String target;
- String soap;
- SOAPMonitorData data;
- int selected;
- int row;
- boolean update_needed;
- while (socket != null) {
- try {
- // Get the data from the server
- message_type = (Integer) in.readObject();
- // Process the data depending on its type
- switch (message_type.intValue()) {
- case SOAPMonitorConstants.SOAP_MONITOR_REQUEST:
- // Get the id, target and soap info
- id = (Long) in.readObject();
- target = (String) in.readObject();
- soap = (String) in.readObject();
- // Add new request data to the table
- data = new SOAPMonitorData(id,target,soap);
- model.addData(data);
- // If "most recent" selected then update
- // the details area if needed
- selected = table.getSelectedRow();
- if ((selected == 0) && model.filterMatch(data)) {
- valueChanged(null);
- }
- break;
- case SOAPMonitorConstants.SOAP_MONITOR_RESPONSE:
- // Get the id and soap info
- id = (Long) in.readObject();
- soap = (String) in.readObject();
- data = model.findData(id);
- if (data != null) {
- update_needed = false;
- // Get the selected row
- selected = table.getSelectedRow();
- // If "most recent", then always
- // update details area
- if (selected == 0) {
- update_needed = true;
- }
- // If the data being updated is
- // selected then update details
- row = model.findRow(data);
- if ((row != -1) && (row == selected)) {
- update_needed = true;
- }
- // Set the response and update table
- data.setSOAPResponse(soap);
- model.updateData(data);
- // Refresh details area (if needed)
- if (update_needed) {
- valueChanged(null);
- }
- }
- break;
- }
-
- } catch (Exception e) {
- // Exceptions are expected here when the
- // server communication has been terminated.
- if (stop_button.isEnabled()) {
- stop();
- setErrorStatus(STATUS_CLOSED);
- }
- }
- }
- }
-
- /**
- * Listener to handle table selection changes
- */
- public void valueChanged(ListSelectionEvent e) {
- int row = table.getSelectedRow();
- // Check if they selected a specific row
- if (row > 0) {
- remove_button.setEnabled(true);
- } else {
- remove_button.setEnabled(false);
- }
- // Check for "most recent" selection
- if (row == 0) {
- row = model.getRowCount() - 1;
- if (row == 0) {
- row = -1;
- }
- }
- if (row == -1) {
- // Clear the details panel
- details_time_value.setText("");
- details_target_value.setText("");
- details_status_value.setText("");
- request_text.setText("");
- response_text.setText("");
- } else {
- // Show the details for the row
- SOAPMonitorData soap = model.getData(row);
- details_time_value.setText(soap.getTime());
- details_target_value.setText(soap.getTargetService());
- details_status_value.setText(soap.getStatus());
- if (soap.getSOAPRequest() == null) {
- request_text.setText("");
- } else {
- request_text.setText(soap.getSOAPRequest());
- request_text.setCaretPosition(0);
- }
- if (soap.getSOAPResponse() == null) {
- response_text.setText("");
- } else {
- response_text.setText(soap.getSOAPResponse());
- response_text.setCaretPosition(0);
- }
- }
- }
-
- /**
- * Listener to handle button actions
- */
- public void actionPerformed(ActionEvent e) {
- // Check if the user pressed the remove button
- if (e.getSource() == remove_button) {
- int row = table.getSelectedRow();
- model.removeRow(row);
- table.clearSelection();
- table.repaint();
- valueChanged(null);
- }
- // Check if the user pressed the remove all button
- if (e.getSource() == remove_all_button) {
- model.clearAll();
- table.setRowSelectionInterval(0,0);
- table.repaint();
- valueChanged(null);
- }
- // Check if the user pressed the filter button
- if (e.getSource() == filter_button) {
- filter.showDialog();
- if (filter.okPressed()) {
- // Update the display with new filter
- model.setFilter(filter);
- table.repaint();
- }
- }
- // Check if the user pressed the start button
- if (e.getSource() == start_button) {
- start();
- }
- // Check if the user pressed the stop button
- if (e.getSource() == stop_button) {
- stop();
- }
- // Check if the user wants to switch layout
- if (e.getSource() == layout_button) {
- details_panel.remove(details_soap);
- details_soap.removeAll();
- if (details_soap.getOrientation() == JSplitPane.HORIZONTAL_SPLIT) {
- details_soap = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
- } else {
- details_soap = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
- }
- details_soap.setTopComponent(request_panel);
- details_soap.setRightComponent(response_panel);
- details_soap.setResizeWeight(.5);
- details_panel.add(details_soap, BorderLayout.CENTER);
- details_panel.validate();
- details_panel.repaint();
- }
- // Check if the user is changing the reflow option
- if (e.getSource() == reflow_xml) {
- request_text.setReflowXML(reflow_xml.isSelected());
- response_text.setReflowXML(reflow_xml.isSelected());
- }
- }
- }
-
- /**
- * This class represend the data for a SOAP request/response pair
- */
- class SOAPMonitorData {
-
- /**
- * Private data
- */
- private Long id;
- private String time;
- private String target;
- private String soap_request;
- private String soap_response;
-
- /**
- * Constructor
- */
- public SOAPMonitorData(Long id, String target, String soap_request) {
- this.id = id;
- // A null id is used to signal that the "most recent" entry
- // is being created.
- if (id == null) {
- this.time = "Most Recent";
- this.target = "---";
- this.soap_request = null;
- this.soap_response = null;
- } else {
- this.time = DateFormat.getTimeInstance().format(new Date());
- this.target = target;
- this.soap_request = soap_request;
- this.soap_response = null;
- }
- }
-
- /**
- * Get the id for the SOAP message
- */
- public Long getId() {
- return id;
- }
-
- /**
- * Get the time the SOAP request was received by the applet
- */
- public String getTime() {
- return time;
- }
-
- /**
- * Get the SOAP request target service name
- */
- public String getTargetService() {
- return target;
- }
-
- /**
- * Get the status of the request
- */
- public String getStatus() {
- String status = "---";
- if (id != null) {
- status = "Complete";
- if (soap_response == null) {
- status = "Active";
- }
- }
- return status;
- }
-
- /**
- * Get the request SOAP contents
- */
- public String getSOAPRequest() {
- return soap_request;
- }
-
- /**
- * Set the resposne SOAP contents
- */
- public void setSOAPResponse(String response) {
- soap_response = response;
- }
-
- /**
- * Get the response SOAP contents
- */
- public String getSOAPResponse() {
- return soap_response;
- }
- }
-
- /**
- * This table model is used to manage the table displayed
- * at the top of the page to show all the SOAP messages
- * we have received and to control which message details are
- * to be displayed on the bottom of the page.
- */
- class SOAPMonitorTableModel extends AbstractTableModel {
-
- /**
- * Column titles
- */
- private final String[] column_names = { "Time",
- "Target Service",
- "Status" };
- /**
- * Private data
- */
- private Vector data;
- private Vector filter_include;
- private Vector filter_exclude;
- private boolean filter_active;
- private boolean filter_complete;
- private Vector filter_data;
-
- /**
- * Constructor
- */
- public SOAPMonitorTableModel() {
- data = new Vector();
- // Add "most recent" entry to top of table
- SOAPMonitorData soap = new SOAPMonitorData(null,null,null);
- data.addElement(soap);
- filter_include = null;
- filter_exclude = null;
- filter_active = false;
- filter_complete = false;
- filter_data = null;
- // By default, exclude NotificationService and
- // EventViewerService messages
- filter_exclude = new Vector();
- filter_exclude.addElement("NotificationService");
- filter_exclude.addElement("EventViewerService");
- filter_data = new Vector();
- filter_data.addElement(soap);
- }
-
- /**
- * Get column count (part of table model interface)
- */
- public int getColumnCount() {
- return column_names.length;
- }
-
- /**
- * Get row count (part of table model interface)
- */
- public int getRowCount() {
- int count = data.size();
- if (filter_data != null) {
- count = filter_data.size();
- }
- return count;
- }
-
- /**
- * Get column name (part of table model interface)
- */
- public String getColumnName(int col) {
- return column_names[col];
- }
-
- /**
- * Get value at (part of table model interface)
- */
- public Object getValueAt(int row, int col) {
- SOAPMonitorData soap;
- String value = null;
- soap = (SOAPMonitorData) data.elementAt(row);
- if (filter_data != null) {
- soap = (SOAPMonitorData) filter_data.elementAt(row);
- }
- switch (col) {
- case 0:
- value = soap.getTime();
- break;
- case 1:
- value = soap.getTargetService();
- break;
- case 2:
- value = soap.getStatus();
- break;
- }
- return value;
- }
-
- /**
- * Check if soap data matches filter
- */
- public boolean filterMatch(SOAPMonitorData soap) {
- boolean match = true;
- if (filter_include != null) {
- // Check for service match
- Enumeration e = filter_include.elements();
- match = false;
- while (e.hasMoreElements() && !match) {
- String service = (String) e.nextElement();
- if (service.equals(soap.getTargetService())) {
- match = true;
- }
- }
- }
- if (filter_exclude != null) {
- // Check for service match
- Enumeration e = filter_exclude.elements();
- while (e.hasMoreElements() && match) {
- String service = (String) e.nextElement();
- if (service.equals(soap.getTargetService())) {
- match = false;
- }
- }
- }
- if (filter_active) {
- // Check for active status match
- if (soap.getSOAPResponse() != null) {
- match = false;
- }
- }
- if (filter_complete) {
- // Check for complete status match
- if (soap.getSOAPResponse() == null) {
- match = false;
- }
- }
- // The "most recent" is always a match
- if (soap.getId() == null) {
- match = true;
- }
- return match;
- }
-
- /**
- * Add data to the table as a new row
- */
- public void addData(SOAPMonitorData soap) {
- int row = data.size();
- data.addElement(soap);
- if (filter_data != null) {
- if (filterMatch(soap)) {
- row = filter_data.size();
- filter_data.addElement(soap);
- fireTableRowsInserted(row,row);
- }
- } else {
- fireTableRowsInserted(row,row);
- }
- }
-
- /**
- * Find the data for a given id
- */
- public SOAPMonitorData findData(Long id) {
- SOAPMonitorData soap = null;
- for (int row=data.size(); (row > 0) && (soap == null); row--) {
- soap = (SOAPMonitorData) data.elementAt(row-1);
- if (soap.getId().longValue() != id.longValue()) {
- soap = null;
- }
- }
- return soap;
- }
-
- /**
- * Find the row in the table for a given message id
- */
- public int findRow(SOAPMonitorData soap) {
- int row = -1;
- if (filter_data != null) {
- row = filter_data.indexOf(soap);
- } else {
- row = data.indexOf(soap);
- }
- return row;
- }
-
- /**
- * Remove all messages from the table (but leave "most recent")
- */
- public void clearAll() {
- int last_row = data.size() - 1;
- if (last_row > 0) {
- data.removeAllElements();
- SOAPMonitorData soap = new SOAPMonitorData(null,null,null);
- data.addElement(soap);
- if (filter_data != null) {
- filter_data.removeAllElements();
- filter_data.addElement(soap);
- }
- fireTableDataChanged();
- }
- }
-
- /**
- * Remove a message from the table
- */
- public void removeRow(int row) {
- SOAPMonitorData soap = null;
- if (filter_data == null) {
- soap = (SOAPMonitorData) data.elementAt(row);
- data.remove(soap);
- } else {
- soap = (SOAPMonitorData) filter_data.elementAt(row);
- filter_data.remove(soap);
- data.remove(soap);
- }
- fireTableRowsDeleted(row,row);
- }
-
- /**
- * Set a new filter
- */
- public void setFilter(SOAPMonitorFilter filter) {
- // Save new filter criteria
- filter_include = filter.getFilterIncludeList();
- filter_exclude = filter.getFilterExcludeList();
- filter_active = filter.getFilterActive();
- filter_complete = filter.getFilterComplete();
- applyFilter();
- }
-
- /**
- * Refilter the list of messages
- */
- public void applyFilter() {
- // Re-filter using new criteria
- filter_data = null;
- if ((filter_include != null) ||
- (filter_exclude != null) ||
- filter_active || filter_complete ) {
- filter_data = new Vector();
- Enumeration e = data.elements();
- SOAPMonitorData soap;
- while (e.hasMoreElements()) {
- soap = (SOAPMonitorData) e.nextElement();
- if (filterMatch(soap)) {
- filter_data.addElement(soap);
- }
- }
- }
- fireTableDataChanged();
- }
-
- /**
- * Get the data for a row
- */
- public SOAPMonitorData getData(int row) {
- SOAPMonitorData soap = null;
- if (filter_data == null) {
- soap = (SOAPMonitorData) data.elementAt(row);
- } else {
- soap = (SOAPMonitorData) filter_data.elementAt(row);
- }
- return soap;
- }
-
- /**
- * Update a message
- */
- public void updateData (SOAPMonitorData soap) {
- int row;
- if (filter_data == null) {
- // No filter, so just fire table updated
- row = data.indexOf(soap);
- if (row != -1) {
- fireTableRowsUpdated(row,row);
- }
- } else {
- // Check if the row was being displayed
- row = filter_data.indexOf(soap);
- if (row == -1) {
- // Row was not displayed, so check for if it
- // now needs to be displayed
- if (filterMatch(soap)) {
- int index = -1;
- row = data.indexOf(soap) + 1;
- while ((row < data.size()) && (index == -1)) {
- index = filter_data.indexOf(data.elementAt(row));
- if (index != -1) {
- // Insert at this location
- filter_data.add(index,soap);
- }
- row++;
- }
- if (index == -1) {
- // Insert at end
- index = filter_data.size();
- filter_data.addElement(soap);
- }
- fireTableRowsInserted(index,index);
- }
- } else {
- // Row was displayed, so check if it needs to
- // be updated or removed
- if (filterMatch(soap)) {
- fireTableRowsUpdated(row,row);
- } else {
- filter_data.remove(soap);
- fireTableRowsDeleted(row,row);
- }
- }
- }
- }
-
- }
-
- /**
- * Panel with checkbox and list
- */
- class ServiceFilterPanel extends JPanel
- implements ActionListener,
- ListSelectionListener,
- DocumentListener {
-
- private JCheckBox service_box = null;
- private Vector filter_list = null;
- private Vector service_data = null;
- private JList service_list = null;
- private JScrollPane service_scroll = null;
- private JButton remove_service_button = null;
- private JPanel remove_service_panel = null;
- private EmptyBorder indent_border = null;
- private EmptyBorder empty_border = null;
- private JPanel service_area = null;
- private JPanel add_service_area = null;
- private JTextField add_service_field = null;
- private JButton add_service_button = null;
- private JPanel add_service_panel = null;
-
- /**
- * Constructor
- */
- public ServiceFilterPanel(String text, Vector list) {
- empty_border = new EmptyBorder(5,5,0,5);
- indent_border = new EmptyBorder(5,25,5,5);
- service_box = new JCheckBox(text);
- service_box.addActionListener(this);
- service_data = new Vector();
- if (list != null) {
- service_box.setSelected(true);
- service_data = (Vector) list.clone();
- }
- service_list = new JList(service_data);
- service_list.setBorder(new EtchedBorder());
- service_list.setVisibleRowCount(5);
- service_list.addListSelectionListener(this);
- service_list.setEnabled(service_box.isSelected());
- service_scroll = new JScrollPane(service_list);
- service_scroll.setBorder(new EtchedBorder());
- remove_service_button = new JButton("Remove");
- remove_service_button.addActionListener(this);
- remove_service_button.setEnabled(false);
- remove_service_panel = new JPanel();
- remove_service_panel.setLayout(new FlowLayout());
- remove_service_panel.add(remove_service_button);
- service_area = new JPanel();
- service_area.setLayout(new BorderLayout());
- service_area.add(service_scroll, BorderLayout.CENTER);
- service_area.add(remove_service_panel, BorderLayout.EAST);
- service_area.setBorder(indent_border);
- add_service_field = new JTextField();
- add_service_field.addActionListener(this);
- add_service_field.getDocument().addDocumentListener(this);
- add_service_field.setEnabled(service_box.isSelected());
- add_service_button = new JButton("Add");
- add_service_button.addActionListener(this);
- add_service_button.setEnabled(false);
- add_service_panel = new JPanel();
- add_service_panel.setLayout(new BorderLayout());
- JPanel dummy = new JPanel();
- dummy.setBorder(empty_border);
- add_service_panel.add(dummy, BorderLayout.WEST);
- add_service_panel.add(add_service_button, BorderLayout.EAST);
- add_service_area = new JPanel();
- add_service_area.setLayout(new BorderLayout());
- add_service_area.add(add_service_field, BorderLayout.CENTER);
- add_service_area.add(add_service_panel, BorderLayout.EAST);
- add_service_area.setBorder(indent_border);
- setLayout(new BorderLayout());
- add(service_box, BorderLayout.NORTH);
- add(service_area, BorderLayout.CENTER);
- add(add_service_area, BorderLayout.SOUTH);
- setBorder(empty_border);
- }
-
- /**
- * Get the current list of services
- */
- public Vector getServiceList() {
- Vector list = null;
- if (service_box.isSelected()) {
- list = service_data;
- }
- return list;
- }
-
- /**
- * Listener to handle button actions
- */
- public void actionPerformed(ActionEvent e) {
- // Check if the user changed the service filter option
- if (e.getSource() == service_box) {
- service_list.setEnabled(service_box.isSelected());
- service_list.clearSelection();
- remove_service_button.setEnabled(false);
- add_service_field.setEnabled(service_box.isSelected());
- add_service_field.setText("");
- add_service_button.setEnabled(false);
- }
- // Check if the user pressed the add service button
- if ((e.getSource() == add_service_button) ||
- (e.getSource() == add_service_field)) {
- String text = add_service_field.getText();
- if ((text != null) && (text.length() > 0)) {
- service_data.addElement(text);
- service_list.setListData(service_data);
- }
- add_service_field.setText("");
- add_service_field.requestFocus();
- }
- // Check if the user pressed the remove service button
- if (e.getSource() == remove_service_button) {
- Object[] sels = service_list.getSelectedValues();
- for (int i=0; i 0)) {
- add_service_button.setEnabled(true);
- } else {
- add_service_button.setEnabled(false);
- }
- }
-
- /**
- * Handle changes to the text field
- */
- public void insertUpdate(DocumentEvent e) {
- changedUpdate(e);
- }
-
- /**
- * Handle changes to the text field
- */
- public void removeUpdate(DocumentEvent e) {
- changedUpdate(e);
- }
-
- /**
- * Listener to handle service list selection changes
- */
- public void valueChanged(ListSelectionEvent e) {
- if (service_list.getSelectedIndex() == -1) {
- remove_service_button.setEnabled(false);
- } else {
- remove_service_button.setEnabled(true);
- }
- }
- }
-
- /**
- * Class for showing the filter dialog
- */
- class SOAPMonitorFilter implements ActionListener {
-
- /**
- * Private data
- */
- private JDialog dialog = null;
- private JPanel panel = null;
- private JPanel buttons = null;
- private JButton ok_button = null;
- private JButton cancel_button = null;
- private ServiceFilterPanel include_panel = null;
- private ServiceFilterPanel exclude_panel = null;
- private JPanel status_panel = null;
- private JCheckBox status_box = null;
- private EmptyBorder empty_border = null;
- private EmptyBorder indent_border = null;
- private JPanel status_options = null;
- private ButtonGroup status_group = null;
- private JRadioButton status_active = null;
- private JRadioButton status_complete = null;
- private Vector filter_include_list = null;
- private Vector filter_exclude_list = null;
- private boolean filter_active = false;
- private boolean filter_complete = false;
- private boolean ok_pressed = false;
-
- /**
- * Constructor
- */
- public SOAPMonitorFilter() {
- // By default, exclude NotificationService and
- // EventViewerService messages
- filter_exclude_list = new Vector();
- filter_exclude_list.addElement("NotificationService");
- filter_exclude_list.addElement("EventViewerService");
- }
-
- /**
- * Get list of services to be included
- */
- public Vector getFilterIncludeList() {
- return filter_include_list;
- }
-
- /**
- * Get list of services to be excluded
- */
- public Vector getFilterExcludeList() {
- return filter_exclude_list;
- }
-
- /**
- * Check if filter active messages
- */
- public boolean getFilterActive() {
- return filter_active;
- }
-
- /**
- * Check if filter complete messages
- */
- public boolean getFilterComplete() {
- return filter_complete;
- }
-
- /**
- * Show the filter dialog
- */
- public void showDialog() {
- empty_border = new EmptyBorder(5,5,0,5);
- indent_border = new EmptyBorder(5,25,5,5);
- include_panel = new ServiceFilterPanel("Include messages based on target service:",
- filter_include_list);
- exclude_panel = new ServiceFilterPanel("Exclude messages based on target service:",
- filter_exclude_list);
- status_box = new JCheckBox("Filter messages based on status:");
- status_box.addActionListener(this);
- status_active = new JRadioButton("Active messages only");
- status_active.setSelected(true);
- status_active.setEnabled(false);
- status_complete = new JRadioButton("Complete messages only");
- status_complete.setEnabled(false);
- status_group = new ButtonGroup();
- status_group.add(status_active);
- status_group.add(status_complete);
- if (filter_active || filter_complete) {
- status_box.setSelected(true);
- status_active.setEnabled(true);
- status_complete.setEnabled(true);
- if (filter_complete) {
- status_complete.setSelected(true);
- }
- }
- status_options = new JPanel();
- status_options.setLayout(new BoxLayout(status_options, BoxLayout.Y_AXIS));
- status_options.add(status_active);
- status_options.add(status_complete);
- status_options.setBorder(indent_border);
- status_panel = new JPanel();
- status_panel.setLayout(new BorderLayout());
- status_panel.add(status_box, BorderLayout.NORTH);
- status_panel.add(status_options, BorderLayout.CENTER);
- status_panel.setBorder(empty_border);
- ok_button = new JButton("Ok");
- ok_button.addActionListener(this);
- cancel_button = new JButton("Cancel");
- cancel_button.addActionListener(this);
- buttons = new JPanel();
- buttons.setLayout(new FlowLayout());
- buttons.add(ok_button);
- buttons.add(cancel_button);
- panel = new JPanel();
- panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
- panel.add(include_panel);
- panel.add(exclude_panel);
- panel.add(status_panel);
- panel.add(buttons);
- dialog = new JDialog();
- dialog.setTitle("SOAP Monitor Filter");
- dialog.setContentPane(panel);
- dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
- dialog.setModal(true);
- dialog.pack();
- Dimension d = dialog.getToolkit().getScreenSize();
- dialog.setLocation((d.width-dialog.getWidth())/2,
- (d.height-dialog.getHeight())/2);
- ok_pressed = false;
- dialog.show();
- }
-
- /**
- * Listener to handle button actions
- */
- public void actionPerformed(ActionEvent e) {
- // Check if the user pressed the ok button
- if (e.getSource() == ok_button) {
- filter_include_list = include_panel.getServiceList();
- filter_exclude_list = exclude_panel.getServiceList();
- if (status_box.isSelected()) {
- filter_active = status_active.isSelected();
- filter_complete = status_complete.isSelected();
- } else {
- filter_active = false;
- filter_complete = false;
- }
- ok_pressed = true;
- dialog.dispose();
- }
- // Check if the user pressed the cancel button
- if (e.getSource() == cancel_button) {
- dialog.dispose();
- }
- // Check if the user changed the status filter option
- if (e.getSource() == status_box) {
- status_active.setEnabled(status_box.isSelected());
- status_complete.setEnabled(status_box.isSelected());
- }
- }
-
- /**
- * Check if the user pressed the ok button
- */
- public boolean okPressed() {
- return ok_pressed;
- }
- }
-
- /**
- * Text panel class that supports XML reflow
- */
- class SOAPMonitorTextArea extends JTextArea {
-
- /**
- * Private data
- */
- private boolean format = false;
- private String original = "";
- private String formatted = null;
-
- /**
- * Constructor
- */
- public SOAPMonitorTextArea() {
- }
-
- /**
- * Override setText to do formatting
- */
- public void setText(String text) {
- original = text;
- formatted = null;
- if (format) {
- doFormat();
- super.setText(formatted);
- } else {
- super.setText(original);
- }
- }
-
- /**
- * Turn reflow on or off
- */
- public void setReflowXML(boolean reflow) {
- format = reflow;
- if (format) {
- if (formatted == null) {
- doFormat();
- }
- super.setText(formatted);
- } else {
- super.setText(original);
- }
- }
-
- /**
- * Reflow XML
- */
- public void doFormat() {
- Vector parts = new Vector();
- char[] chars = original.toCharArray();
- int index = 0;
- int first = 0;
- String part = null;
- while (index < chars.length) {
- // Check for start of tag
- if (chars[index] == '<') {
- // Did we have data before this tag?
- if (first < index) {
- part = new String(chars,first,index-first);
- part = part.trim();
- // Save non-whitespace data
- if (part.length() > 0) {
- parts.addElement(part);
- }
- }
- // Save the start of tag
- first = index;
- }
- // Check for end of tag
- if (chars[index] == '>') {
- // Save the tag
- part = new String(chars,first,index-first+1);
- parts.addElement(part);
- first = index+1;
- }
- // Check for end of line
- if ((chars[index] == '\n') || (chars[index] == '\r')) {
- // Was there data on this line?
- if (first < index) {
- part = new String(chars,first,index-first);
- part = part.trim();
- // Save non-whitespace data
- if (part.length() > 0) {
- parts.addElement(part);
- }
- }
- first = index+1;
- }
- index++;
- }
- // Reflow as XML
- StringBuffer buf = new StringBuffer();
- Object[] list = parts.toArray();
- int indent = 0;
- int pad = 0;
- index = 0;
- while (index < list.length) {
- part = (String) list[index];
- if (buf.length() == 0) {
- // Just add first tag (should be XML header)
- buf.append(part);
- } else {
- // All other parts need to start on a new line
- buf.append('\n');
- // If we're at an end tag then decrease indent
- if (part.startsWith("")) {
- indent++;
- // Check for special data case
- if ((index + 2) < list.length) {
- part = (String) list[index+2];
- if (part.startsWith("
-
-
-<%@ page contentType="text/html; charset=utf-8" %>
-<%
-/*
- * Copyright 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.
- */
-%>
-
-<%@ include file="i18nLib.jsp" %>
-
-<%
- // initialize a private HttpServletRequest
- setRequest(request);
-
- // set a resouce base
- setResouceBase("i18n");
-%>
-
-
-
- Apache-Axis
-
-
-
-
-Apache-AXIS
-
-<%= getLocaleChoice() %>
-
-<%
- out.print(getMessage("welcomeMessage")+"");
- out.print(getMessage("operationType"));
-%>
-
-
-
-<%
- out.print(getMessage("sideNote") +"");
-%>
-
-<%
- out.print(""+ getMessage("validatingAxis") +"
");
-
- out.print(getMessage("validationNote00") +"");
- out.print(getMessage("validationNote01"));
-%>
-
-
diff --git a/services/additions/admin/axis/fingerprint.jsp b/services/additions/admin/axis/fingerprint.jsp
deleted file mode 100644
index fa122ce83..000000000
--- a/services/additions/admin/axis/fingerprint.jsp
+++ /dev/null
@@ -1,274 +0,0 @@
-<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
-
-<%@ page import="java.io.File,
- java.io.IOException,
- java.util.Date"
- session="false" %>
-
-
-System Fingerprint
-
-
-<%!
-
- /*
- * Fingerprint the users system. This is mainly for use in
- * diagnosing classpath problems. It is intended to dump out
- * a copy of the environment this webapp is running in,
- * and additionally attempt to identify versions of each jar
- * in the classpath.
- *
- * @author Brian Ewins
- */
-
- private java.util.Properties versionProps=new java.util.Properties();
-
- /**
- * Identify the version of a jar file. This uses a properties file
- * containing known names and sizes in the format
- * 'name(size)=version'. Version strings should be like 'xerces-1.4'
- * ie they should include the name of the library.
- */
- public String getFileVersion(File file) throws IOException {
- String key=""+file.getName()+" | ";
- key+= ""+file.length()+" | ";
- Date timestamp=new Date(file.lastModified());
- key+= ""+timestamp.toString()+" | ";
- return key;
-
- /* TODO: implement
- String value=versionProps.getProperty(key);
- if (value==null) {
- // make it possible to have jars without version nos
- value=versionProps.getProperty(file.getName());
- }
- if (value==null) {
- // fall back on something obvious
- value=key;
- Date timestamp=new Date(file.lastModified());
- value+=" / "+timestamp.toString();
- }
- return value;
- */
- }
-
- /**
- * Split up a classpath-like variable. Returns a list of files.
- * TODO: this can't cope with relative paths. I think theres code in BCEL that
- * can be used for this?
- */
- File[] splitClasspath(String path) throws IOException {
- java.util.StringTokenizer st=
- new java.util.StringTokenizer(path,
- System.getProperty("path.separator"));
- int toks=st.countTokens();
- File[] files=new File[toks];
- for(int i=0;i");
- out.print(title);
- out.println("");
- out.println("");
- for (int i=0; i"+getFileVersion(jars[i])+"");
- }
- out.println("
");
- if(comment!=null && comment.length()>0) {
- out.println("");
- out.println(comment);
- out.println("
");
- }
- }
-
-%>
-
System Fingerprint
-JVM and Server Version
-
-
- | Servlet Engine |
- <%= getServletConfig().getServletContext().getServerInfo() %> |
- <%= getServletConfig().getServletContext().getMajorVersion() %> |
- <%= getServletConfig().getServletContext().getMinorVersion() %> |
-
-
- | Java VM |
- <%= System.getProperty("java.vm.vendor") %> |
- <%= System.getProperty("java.vm.name") %> |
- <%= System.getProperty("java.vm.version") %> |
-
-
- | Java RE |
- <%= System.getProperty("java.vendor") %> |
- <%= System.getProperty("java.version") %> |
- |
-
-
- | Platform |
- <%= System.getProperty("os.name") %> |
- <%= System.getProperty("os.arch") %> |
- <%= System.getProperty("os.version") %> |
-
-
-
-<%
-listClasspathProperty("Boot jars", out,"sun.boot.class.path", "Only valid on a sun jvm");
-listClasspathProperty("System jars", out,"java.class.path", null);
-listDirpathProperty("Extra system jars", out,"java.ext.dirs", null);
-listContextPath("Webapp jars", out, "/WEB-INF/lib", null);
-// identify the container...
-String container=getServletConfig().getServletContext().getServerInfo();
-if (container.startsWith("Tomcat Web Server/3.2")) {
- String home=System.getProperty("tomcat.home");
- if(home!=null) {
- listDirectory("Tomcat 3.2 Common Jars", out,
- home+File.separator
- +"lib",
- null);
- }
-} else if (container.startsWith("Tomcat Web Server/3.3")) {
- String home=System.getProperty("tomcat.home");
- if(home!=null) {
- listDirectory("Tomcat 3.3 Container Jars", out,
- home+File.separator
- +"lib"+File.separator
- +"container",
- null);
- listDirectory("Tomcat 3.3 Common Jars", out,
- home+File.separator
- +"lib"+File.separator
- +"common",
- null);
- }
-} else if (container.startsWith("Apache Tomcat/4.0")) {
- //handle catalina common dir
- String home=System.getProperty("catalina.home");
- if(home!=null) {
- listDirectory("Tomcat 4.0 Common Jars", out,
- home+File.separator
- +"common"+File.separator
- +"lib",
- null);
- }
-} else if (container.startsWith("Apache Tomcat/4.1")) {
- //handle catalina common dir
- String home=System.getProperty("catalina.home");
- if(home!=null) {
- listDirectory("Tomcat 4.1 Common Jars", out,
- home+File.separator
- +"shared"+File.separator
- +"lib",
- null);
- }
-} else if (System.getProperty("resin.home")!=null) {
- String home=System.getProperty("resin.home");
- if(home!=null) {
- listDirectory("Resin Common Jars", out,
- home+File.separator
- +"lib",
- null);
- }
-} else if (System.getProperty("weblogic.httpd.servlet.classpath")!=null) {
- listClasspathProperty("Weblogic Servlet Jars", out,
- "weblogic.httpd.servlet.classpath",
- null);
-} else {
- //TODO: identify more servlet engine classpaths.
-}
-%>
-
-
\ No newline at end of file
diff --git a/services/additions/admin/axis/happyaxis.jsp b/services/additions/admin/axis/happyaxis.jsp
deleted file mode 100644
index 1267783d2..000000000
--- a/services/additions/admin/axis/happyaxis.jsp
+++ /dev/null
@@ -1,493 +0,0 @@
-<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
-
-
-<%@ page contentType="text/html; charset=utf-8"
- import="java.io.InputStream,
- java.io.IOException,
- javax.xml.parsers.SAXParser,
- java.lang.reflect.*,
- javax.xml.parsers.SAXParserFactory"
- session="false" %>
-<%
-/*
- * Copyright 2002,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.
- */
-%>
-
-<%!
- /*
- * Happiness tests for axis. These look at the classpath and warn if things
- * are missing. Normally addng this much code in a JSP page is mad
- * but here we want to validate JSP compilation too, and have a drop-in
- * page for easy re-use
- * @author Steve 'configuration problems' Loughran
- * @author dims
- * @author Brian Ewins
- */
-
- /**
- * test for a class existing
- * @param classname
- * @return class iff present
- */
- Class classExists(String classname) {
- try {
- return Class.forName(classname);
- } catch (ClassNotFoundException e) {
- return null;
- }
- }
-
- /**
- * test for resource on the classpath
- * @param resource
- * @return true iff present
- */
- boolean resourceExists(String resource) {
- boolean found;
- InputStream instream=this.getClass().getResourceAsStream(resource);
- found=instream!=null;
- if(instream!=null) {
- try {
- instream.close();
- } catch (IOException e) {
- }
- }
- return found;
- }
-
- /**
- * probe for a class, print an error message is missing
- * @param out stream to print stuff
- * @param category text like "warning" or "error"
- * @param classname class to look for
- * @param jarFile where this class comes from
- * @param errorText extra error text
- * @param homePage where to d/l the library
- * @return the number of missing classes
- * @throws IOException
- */
- int probeClass(JspWriter out,
- String category,
- String classname,
- String jarFile,
- String description,
- String errorText,
- String homePage) throws IOException {
- try {
- Class clazz = classExists(classname);
- if(clazz == null) {
- String url="";
- if(homePage!=null) {
- url=getMessage("seeHomepage",homePage,homePage);
- }
- out.write(getMessage("couldNotFound",category,classname,jarFile,errorText,url));
- return 1;
- } else {
- String location = getLocation(out, clazz);
-
- if(location == null) {
- out.write(""+getMessage("foundClass00",description,classname)+"
");
- }
- else {
- out.write(""+getMessage("foundClass01",description,classname,location)+"
");
- }
- return 0;
- }
- } catch(NoClassDefFoundError ncdfe) {
- String url="";
- if(homePage!=null) {
- url=getMessage("seeHomepage",homePage,homePage);
- }
- out.write(getMessage("couldNotFoundDep",category, classname, errorText, url));
- out.write(getMessage("theRootCause",ncdfe.getMessage(), classname));
- return 1;
- }
- }
-
- /**
- * get the location of a class
- * @param out
- * @param clazz
- * @return the jar file or path where a class was found
- */
-
- String getLocation(JspWriter out,
- Class clazz) {
- try {
- java.net.URL url = clazz.getProtectionDomain().getCodeSource().getLocation();
- String location = url.toString();
- if(location.startsWith("jar")) {
- url = ((java.net.JarURLConnection)url.openConnection()).getJarFileURL();
- location = url.toString();
- }
-
- if(location.startsWith("file")) {
- java.io.File file = new java.io.File(url.getFile());
- return file.getAbsolutePath();
- } else {
- return url.toString();
- }
- } catch (Throwable t){
- }
- return getMessage("classFoundError");
- }
-
- /**
- * a class we need if a class is missing
- * @param out stream to print stuff
- * @param classname class to look for
- * @param jarFile where this class comes from
- * @param errorText extra error text
- * @param homePage where to d/l the library
- * @throws IOException when needed
- * @return the number of missing libraries (0 or 1)
- */
- int needClass(JspWriter out,
- String classname,
- String jarFile,
- String description,
- String errorText,
- String homePage) throws IOException {
- return probeClass(out,
- ""+getMessage("error")+"",
- classname,
- jarFile,
- description,
- errorText,
- homePage);
- }
-
- /**
- * print warning message if a class is missing
- * @param out stream to print stuff
- * @param classname class to look for
- * @param jarFile where this class comes from
- * @param errorText extra error text
- * @param homePage where to d/l the library
- * @throws IOException when needed
- * @return the number of missing libraries (0 or 1)
- */
- int wantClass(JspWriter out,
- String classname,
- String jarFile,
- String description,
- String errorText,
- String homePage) throws IOException {
- return probeClass(out,
- ""+getMessage("warning")+"",
- classname,
- jarFile,
- description,
- errorText,
- homePage);
- }
-
- /**
- * get servlet version string
- *
- */
-
- public String getServletVersion() {
- ServletContext context=getServletConfig().getServletContext();
- int major = context.getMajorVersion();
- int minor = context.getMinorVersion();
- return Integer.toString(major) + '.' + Integer.toString(minor);
- }
-
- /**
- * what parser are we using.
- * @return the classname of the parser
- */
- private String getParserName() {
- SAXParser saxParser = getSAXParser();
- if (saxParser == null) {
- return getMessage("couldNotCreateParser");
- }
-
- // check to what is in the classname
- String saxParserName = saxParser.getClass().getName();
- return saxParserName;
- }
-
- /**
- * Create a JAXP SAXParser
- * @return parser or null for trouble
- */
- private SAXParser getSAXParser() {
- SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
- if (saxParserFactory == null) {
- return null;
- }
- SAXParser saxParser = null;
- try {
- saxParser = saxParserFactory.newSAXParser();
- } catch (Exception e) {
- }
- return saxParser;
- }
-
- /**
- * get the location of the parser
- * @return path or null for trouble in tracking it down
- */
-
- private String getParserLocation(JspWriter out) {
- SAXParser saxParser = getSAXParser();
- if (saxParser == null) {
- return null;
- }
- String location = getLocation(out,saxParser.getClass());
- return location;
- }
-
- /**
- * Check if class implements specified interface.
- * @param Class clazz
- * @param String interface name
- * @return boolean
- */
- private boolean implementsInterface(Class clazz, String interfaceName) {
- if (clazz == null) {
- return false;
- }
- Class[] interfaces = clazz.getInterfaces();
- if (interfaces.length != 0) {
- for (int i = 0; i < interfaces.length; i++) {
- if (interfaces[i].getName().equals(interfaceName)) {
- return true;
- }
- }
- }
- return false;
- }
- %>
-
-<%@ include file="i18nLib.jsp" %>
-
-<%
- // initialize a private HttpServletRequest
- setRequest(request);
-
- // set a resouce base
- setResouceBase("i18n");
-%>
-
-
-<%= getMessage("pageTitle") %>
-
-
-
-<%
- out.print(""+ getMessage("pageTitle") +"
");
- out.print(""+ getMessage("pageRole") +"
");
-%>
-
-<%= getLocaleChoice() %>
-
-<%
- out.print(""+ getMessage("neededComponents") +"
");
-%>
-
-
-<%
- int needed=0,wanted=0;
-
- /**
- * the essentials, without these Axis is not going to work
- */
-
- // need to check if the available version of SAAJ API meets requirements
- String className = "javax.xml.soap.SOAPPart";
- String interfaceName = "org.w3c.dom.Document";
- Class clazz = classExists(className);
- if (clazz == null || implementsInterface(clazz, interfaceName)) {
- needed = needClass(out, "javax.xml.soap.SOAPMessage",
- "saaj.jar",
- "SAAJ API",
- getMessage("criticalErrorMessage"),
- "http://ws.apache.org/axis/");
- } else {
- String location = getLocation(out, clazz);
-
- out.print(getMessage("invalidSAAJ",location));
- out.print(getMessage("criticalErrorMessage"));
- out.print(getMessage("seeHomepage","http://ws.apache.org/axis/java/install.html",getMessage("axisInstallation")));
- out.print("
");
- }
-
- needed+=needClass(out, "javax.xml.rpc.Service",
- "jaxrpc.jar",
- "JAX-RPC API",
- getMessage("criticalErrorMessage"),
- "http://ws.apache.org/axis/");
-
- needed+=needClass(out, "org.apache.axis.transport.http.AxisServlet",
- "axis.jar",
- "Apache-Axis",
- getMessage("criticalErrorMessage"),
- "http://ws.apache.org/axis/");
-
- needed+=needClass(out, "org.apache.commons.discovery.Resource",
- "commons-discovery.jar",
- "Jakarta-Commons Discovery",
- getMessage("criticalErrorMessage"),
- "http://jakarta.apache.org/commons/discovery/");
-
- needed+=needClass(out, "org.apache.commons.logging.Log",
- "commons-logging.jar",
- "Jakarta-Commons Logging",
- getMessage("criticalErrorMessage"),
- "http://jakarta.apache.org/commons/logging/");
-
- needed+=needClass(out, "org.apache.log4j.Layout",
- "log4j-1.2.8.jar",
- "Log4j",
- getMessage("uncertainErrorMessage"),
- "http://jakarta.apache.org/log4j");
-
- //should we search for a javax.wsdl file here, to hint that it needs
- //to go into an approved directory? because we dont seem to need to do that.
- needed+=needClass(out, "com.ibm.wsdl.factory.WSDLFactoryImpl",
- "wsdl4j.jar",
- "IBM's WSDL4Java",
- getMessage("criticalErrorMessage"),
- null);
-
- needed+=needClass(out, "javax.xml.parsers.SAXParserFactory",
- "xerces.jar",
- "JAXP implementation",
- getMessage("criticalErrorMessage"),
- "http://xml.apache.org/xerces-j/");
-
- needed+=needClass(out,"javax.activation.DataHandler",
- "activation.jar",
- "Activation API",
- getMessage("criticalErrorMessage"),
- "http://java.sun.com/products/javabeans/glasgow/jaf.html");
-%>
-
-<%
- out.print(""+ getMessage("optionalComponents") +"
");
-%>
-
-<%
- /*
- * now the stuff we can live without
- */
- wanted+=wantClass(out,"javax.mail.internet.MimeMessage",
- "mail.jar",
- "Mail API",
- getMessage("attachmentsError"),
- "http://java.sun.com/products/javamail/");
-
- wanted+=wantClass(out,"org.apache.xml.security.Init",
- "xmlsec.jar",
- "XML Security API",
- getMessage("xmlSecurityError"),
- "http://xml.apache.org/security/");
-
- wanted += wantClass(out, "javax.net.ssl.SSLSocketFactory",
- "jsse.jar or java1.4+ runtime",
- "Java Secure Socket Extension",
- getMessage("httpsError"),
- "http://java.sun.com/products/jsse/");
- /*
- * resources on the classpath path
- */
- /* add more libraries here */
-
-%>
-
-<%
- out.write("");
- //is everythng we need here
- if(needed==0) {
- //yes, be happy
- out.write(getMessage("happyResult00"));
- } else {
- //no, be very unhappy
- response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
- out.write(getMessage("unhappyResult00",Integer.toString(needed)));
- }
- //now look at wanted stuff
- if(wanted>0) {
- out.write(getMessage("unhappyResult01",Integer.toString(wanted)));
- } else {
- out.write(getMessage("happyResult01"));
- }
- out.write("
");
-%>
-
-<%
-
- //hint if anything is missing
- if(needed>0 || wanted>0 ) {
- out.write(getMessage("hintString"));
- }
-
- out.write(getMessage("noteString"));
-%>
-
-
- <%= getMessage("apsExamining") %>
-
-
- <%
- String servletVersion=getServletVersion();
- String xmlParser=getParserName();
- String xmlParserLocation = getParserLocation(out);
- %>
-
- | Servlet version | <%= servletVersion %> |
- | XML Parser | <%= xmlParser %> |
- | XML ParserLocation | <%= xmlParserLocation %> |
-
-
-
-<% if(xmlParser.indexOf("crimson")>=0) { %>
-
- <%= getMessage("recommendedParser") %>
-
-<% } %>
-
- <%= getMessage("sysExamining") %>
-
-<%
- /**
- * Dump the system properties
- */
- java.util.Enumeration e=null;
- try {
- e= System.getProperties().propertyNames();
- } catch (SecurityException se) {
- }
- if(e!=null) {
- out.write("
");
- for (;e.hasMoreElements();) {
- String key = (String) e.nextElement();
- out.write(key + "=" + System.getProperty(key)+"\n");
- }
- out.write("");
- } else {
- out.write(getMessage("sysPropError"));
- }
-%>
-
-
- <%= getMessage("apsPlatform") %>:
- <%= getServletConfig().getServletContext().getServerInfo() %>
-
-
diff --git a/services/additions/admin/axis/i18nLib.jsp b/services/additions/admin/axis/i18nLib.jsp
deleted file mode 100644
index 545b69e0f..000000000
--- a/services/additions/admin/axis/i18nLib.jsp
+++ /dev/null
@@ -1,223 +0,0 @@
-<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
-
-<%@ page import="java.util.*" %>
-<%
-/*
- * Copyright 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.
- */
-%>
-
-<%!
- /*
- * A library file to produce i18n web applications. This can be easily
- * reused from your jsp(s) - just include and call any methods.
- * @author toshi
- */
-
- // private variable
- HttpServletRequest _req = null;
-
- // private variable
- String _strResourceName = null;
-
- /**
- * Set a HttpServletRequest to a private variable.
- * @param request HttpServletRequest
- */
- void setRequest(HttpServletRequest request) {
- _req = request;
- }
-
- /**
- * Get the private variable of the HttpServletRequest.
- * @return HttpServletRequest
- */
- HttpServletRequest getRequest() {
- return _req;
- }
-
- /**
- * Set a resouce base name to a private variable.
- * @param resouce The resouce base name
- */
- void setResouceBase(String resource) {
- _strResourceName = resource;
- }
-
- /**
- * Get the private variable of the resouce base name.
- * @return resouce The resouce base name
- */
- String getResouceBase() {
- return _strResourceName;
- }
-
- /**
- * Get a ResourceBundle object.
- * @return a ResourceBundle object
- */
- ResourceBundle getRB() {
- String strLocale = getRequest().getParameter("locale");
- ResourceBundle objRb = null;
- Locale objLcl = null;
-
- if (strLocale!=null) {
- objLcl=new Locale(strLocale,"");
- } else {
- objLcl=getRequest().getLocale();
- }
-
- Locale.setDefault(objLcl);
- objRb = ResourceBundle.getBundle(getResouceBase(),objLcl);
-
- return objRb;
- }
-
- /**
- * Get a list of locale choice
- * @return a list of supported locales
- */
- String getLocaleChoice() {
- String choice = getMessage("locales");
- StringBuffer buf = new StringBuffer();
-
- buf.append("\n");
- buf.append(getMessage("language"));
- buf.append(": ");
-
- StringTokenizer st = new StringTokenizer(choice);
- String locale = null;
- while (st.hasMoreTokens()) {
- locale = st.nextToken();
- buf.append("[
"+ locale +"] ");
- }
- buf.append("\n
-
-
|
- |
-
address:
-
phone:
-
email:
-
-
- 
-
-
-
-
-
-
-