Author: giacomo
Date: Thu Nov 11 12:01:22 2004
New Revision: 57464
Removed:
cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-event-impl-1.1.jar
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/axis/java/org/apache/cocoon/webservices/system/DeploymentDescriptor.wsdd
cocoon/branches/BRANCH_2_1_X/src/blocks/axis/java/org/apache/cocoon/webservices/system/System.java
Log:
get rid of excalibur-even-impl package by fixing sample code
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/axis/java/org/apache/cocoon/webservices/system/DeploymentDescriptor.wsdd
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/axis/java/org/apache/cocoon/webservices/system/DeploymentDescriptor.wsdd
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/axis/java/org/apache/cocoon/webservices/system/DeploymentDescriptor.wsdd
Thu Nov 11 12:01:22 2004
@@ -19,7 +19,7 @@
<service name="Cocoon-JVM-System" provider="java:RPC">
<parameter name="className"
value="org.apache.cocoon.webservices.system.System"/>
- <parameter name="allowedMethods" value="getProperties getArchitecture
getCPUInfo getNumProcessors getOperatingSystem getOperatingSystemVersion"/>
+ <parameter name="allowedMethods" value="getProperties getArchitecture
getOperatingSystem getOperatingSystemVersion"/>
</service>
</deployment>
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/axis/java/org/apache/cocoon/webservices/system/System.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/axis/java/org/apache/cocoon/webservices/system/System.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/axis/java/org/apache/cocoon/webservices/system/System.java
Thu Nov 11 12:01:22 2004
@@ -16,9 +16,7 @@
package org.apache.cocoon.webservices.system;
import java.util.Properties;
-
import org.apache.commons.lang.SystemUtils;
-import org.apache.excalibur.util.SystemUtil;
/**
* Class which provides JVM system related SOAP services.
@@ -44,25 +42,6 @@
*/
public String getArchitecture() {
return SystemUtils.OS_ARCH;
- }
-
- /**
- * <code>getCPUInfo</code> returns host CPU information.
- * @deprecated This will be removed in Cocoon 2.2
- * @return host CPU information
- */
- public String getCPUInfo() {
- return SystemUtil.cpuInfo();
- }
-
- /**
- * <code>getNumProcessors</code> returns the number of processors in
- * this machine.
- * @deprecated This will be removed in Cocoon 2.2
- * @return number of processors
- */
- public int getNumProcessors() {
- return SystemUtil.numProcessors();
}
/**
