axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davidills...@apache.org
Subject svn commit: r724507 [3/3] - in /webservices/axis2/trunk/java/modules: integration/test/org/apache/axis2/engine/ kernel/src/org/apache/axis2/addressing/i18n/ kernel/src/org/apache/axis2/context/ kernel/src/org/apache/axis2/context/externalize/ kernel/sr...
Date Mon, 08 Dec 2008 22:01:37 GMT
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/SessionUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/SessionUtils.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/SessionUtils.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/SessionUtils.java
Mon Dec  8 14:01:35 2008
@@ -34,7 +34,7 @@
      * @return scope for the service group
      */
     public static String calculateMaxScopeForServiceGroup(AxisServiceGroup axisServiceGroup)
{
-        Iterator servics = axisServiceGroup.getServices();
+        Iterator<AxisService> servics = axisServiceGroup.getServices();
         int maxScope = 1;
         while (servics.hasNext()) {
             AxisService axisService = (AxisService) servics.next();

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java Mon Dec
 8 14:01:35 2008
@@ -121,8 +121,8 @@
 
     private static ClassLoader getContextClassLoader_DoPriv() {
         return (ClassLoader) org.apache.axis2.java.security.AccessController.doPrivileged(
-                new PrivilegedAction() {
-                    public Object run() {
+                new PrivilegedAction<ClassLoader>() {
+                    public ClassLoader run() {
                         return Thread.currentThread().getContextClassLoader();
                     }
                 }
@@ -257,8 +257,8 @@
             axis2xmlString = axis2xml.getName();
         }
         String path = (String) org.apache.axis2.java.security.AccessController.doPrivileged(
-                new PrivilegedAction() {
-                    public Object run() {
+                new PrivilegedAction<String>() {
+                    public String run() {
                         return file.getAbsolutePath();
                     }
                 }
@@ -269,8 +269,8 @@
 
     private static boolean exists(final File file) {
         Boolean exists = (Boolean) org.apache.axis2.java.security.AccessController.doPrivileged(
-                new PrivilegedAction() {
-                    public Object run() {
+                new PrivilegedAction<Boolean>() {
+                    public Boolean run() {
                         return new Boolean(file.exists());
                     }
                 }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
Mon Dec  8 14:01:35 2008
@@ -19,6 +19,14 @@
 
 package org.apache.axis2.util;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.namespace.QName;
+
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNamespace;
@@ -38,19 +46,8 @@
 import org.apache.axis2.wsdl.SOAPHeaderMessage;
 import org.apache.axis2.wsdl.SOAPModuleMessage;
 import org.apache.neethi.Policy;
-import org.apache.neethi.PolicyComponent;
 import org.apache.neethi.PolicyReference;
 
-import javax.xml.namespace.QName;
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLStreamException;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
 /**
  * Helps the AxisService to WSDL process
  */
@@ -67,10 +64,10 @@
      * @param nameSpaceMap - The namespaceMap
      * @return - The prefix of the namespace
      */
-    public static String getPrefix(String namespace, Map nameSpaceMap) {
-        Set keySet;
+    public static String getPrefix(String namespace, Map<String, String> nameSpaceMap)
{
+        Set<String> keySet;
         if (nameSpaceMap != null && (keySet = nameSpaceMap.keySet()) != null) {
-            Iterator keys = keySet.iterator();
+            Iterator<String> keys = keySet.iterator();
             while (keys.hasNext()) {
                 String key = (String) keys.next();
                 if (nameSpaceMap.get(key).equals(namespace)) {

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/threadpool/ThreadPool.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/threadpool/ThreadPool.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/threadpool/ThreadPool.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/threadpool/ThreadPool.java
Mon Dec  8 14:01:35 2008
@@ -137,8 +137,8 @@
             Thread returnThread = null;
             try {
                 returnThread = (Thread)
-                        AccessController.doPrivileged(new PrivilegedExceptionAction() {
-                            public Object run() {
+                        AccessController.doPrivileged(new PrivilegedExceptionAction<Thread>()
{
+                            public Thread run() {
                                 Thread newThread =
                                         new Thread(runnable, name);
                                 newThread.setDaemon(daemon);

Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/DeploymentTotalTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/DeploymentTotalTest.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/DeploymentTotalTest.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/DeploymentTotalTest.java
Mon Dec  8 14:01:35 2008
@@ -31,6 +31,7 @@
 
 import javax.xml.stream.XMLStreamException;
 import java.util.ArrayList;
+import java.util.List;
 
 public class DeploymentTotalTest extends TestCase {
     AxisConfiguration axisConfig;
@@ -51,7 +52,7 @@
     }
 
     public void testDynamicPhase() {
-        ArrayList inFlow = axisConfig.getInFlowPhases();
+        List inFlow = axisConfig.getInFlowPhases();
         for (int i = 0; i < inFlow.size(); i++) {
             Phase phase = (Phase) inFlow.get(i);
             if (phase.getName().equals("NewPhase")) {
@@ -65,11 +66,11 @@
         inFlow = axisConfig.getInFaultFlowPhases();
         assertTrue("NewPhase wasn't found in InFaultFlow", isPhaseInFlow(inFlow, "NewPhase"));
 
-        ArrayList outFlow = axisConfig.getInFaultFlowPhases();
+        List outFlow = axisConfig.getInFaultFlowPhases();
         assertTrue("NewPhase wasn't found in OutFlow", isPhaseInFlow(outFlow, "NewPhase"));
       
     }
 
-    private boolean isPhaseInFlow(ArrayList inFlow, String phaseName) {
+    private boolean isPhaseInFlow(List inFlow, String phaseName) {
         boolean found = false;
         for (Object anInFlow : inFlow) {
             Phase phase = (Phase)anInFlow;

Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java
Mon Dec  8 14:01:35 2008
@@ -19,7 +19,13 @@
 
 package org.apache.axis2.deployment;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
 import junit.framework.TestCase;
+
 import org.apache.axis2.AbstractTestCase;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContextFactory;
@@ -30,9 +36,6 @@
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.Phase;
 
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-
 public class ModuleDisengagementTest extends TestCase {
     AxisConfiguration config;
     String serviceName = "testService";
@@ -61,7 +64,7 @@
         assertNotNull(module);
         Phase phase;
         Phase userPhase;
-        ArrayList globalinflow = config.getInFlowPhases();
+        List globalinflow = config.getInFlowPhases();
         assertNotNull(globalinflow);
         phase = (Phase) globalinflow.get(3);
         assertNotNull(phase);
@@ -88,7 +91,7 @@
         assertNotNull(module);
         Phase phase;
         Phase userPhase;
-        ArrayList globalinflow = config.getInFlowPhases();
+        List globalinflow = config.getInFlowPhases();
         assertNotNull(globalinflow);
         phase = (Phase) globalinflow.get(3);
         assertNotNull(phase);
@@ -125,7 +128,7 @@
         assertNotNull(module);
         Phase phase;
         Phase userPhase;
-        ArrayList globalinflow = config.getInFlowPhases();
+        List globalinflow = config.getInFlowPhases();
         assertNotNull(globalinflow);
         phase = (Phase) globalinflow.get(3);
         assertNotNull(phase);
@@ -152,7 +155,7 @@
         assertNotNull(module);
         Phase predisptah;
         Phase userPhase;
-        ArrayList globalinflow = config.getInFlowPhases();
+        List globalinflow = config.getInFlowPhases();
         assertNotNull(globalinflow);
         predisptah = (Phase) globalinflow.get(3);
         assertNotNull(predisptah);
@@ -179,7 +182,7 @@
         assertNotNull(module);
         Phase phase;
         Phase userPhase;
-        ArrayList globalinflow = config.getInFlowPhases();
+        List globalinflow = config.getInFlowPhases();
         assertNotNull(globalinflow);
         phase = (Phase) globalinflow.get(3);
         assertNotNull(phase);
@@ -206,7 +209,7 @@
         assertNotNull(module);
         Phase phase;
         Phase userPhase;
-        ArrayList globalinflow = config.getInFlowPhases();
+        List globalinflow = config.getInFlowPhases();
         assertNotNull(globalinflow);
         phase = (Phase) globalinflow.get(3);
         assertNotNull(phase);

Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/AddingHandlerToEachPhaseTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/AddingHandlerToEachPhaseTest.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/AddingHandlerToEachPhaseTest.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/AddingHandlerToEachPhaseTest.java
Mon Dec  8 14:01:35 2008
@@ -40,7 +40,7 @@
     public void testPhaseRules() throws Exception {
         //TODO fix me
         axisConfig = new AxisConfiguration();
-        ArrayList inPhase = axisConfig.getInFlowPhases();
+        List inPhase = axisConfig.getInFlowPhases();
         Phase transportIN = new Phase("TransportIn");
         Phase preDispatch = new Phase("PreDispatch");
         DispatchPhase dispatchPhase = new DispatchPhase();
@@ -80,7 +80,7 @@
         super.setUp();
         //TODO fix me
         axisConfig = new AxisConfiguration();
-        ArrayList inPhase = axisConfig.getInFlowPhases();
+        List inPhase = axisConfig.getInFlowPhases();
         Phase transportIN = new Phase("TransportIn");
         Phase preDispatch = new Phase("PreDispatch");
         DispatchPhase dispatchPhase = new DispatchPhase();
@@ -114,7 +114,7 @@
     public void testPhaseRulesWithAfter() throws Exception {
         //TODO fix me
         axisConfig = new AxisConfiguration();
-        ArrayList inPhase = axisConfig.getInFlowPhases();
+        List inPhase = axisConfig.getInFlowPhases();
         Phase transportIN = new Phase("TransportIn");
         Phase preDispatch = new Phase("PreDispatch");
         DispatchPhase dispatchPhase = new DispatchPhase();

Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseRuleTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseRuleTests.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseRuleTests.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseRuleTests.java
Mon Dec  8 14:01:35 2008
@@ -19,7 +19,12 @@
 
 package org.apache.axis2.phaserule;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 import junit.framework.TestCase;
+
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
@@ -32,10 +37,6 @@
 import org.apache.axis2.phaseresolver.PhaseException;
 import org.apache.axis2.phaseresolver.PhaseHolder;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * Test various PhaseRule configurations
  */
@@ -308,7 +309,7 @@
 
     public void testPhaseRules() throws Exception {
         // TODO : What is this testing exactly?
-        ArrayList inPhase = new AxisConfiguration().getInFlowPhases();
+    	List inPhase = new AxisConfiguration().getInFlowPhases();
         Phase transportIN = new Phase("TransportIn");
         Phase preDispatch = new Phase("PreDispatch");
         DispatchPhase dispatchPhase = new DispatchPhase();

Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java
Mon Dec  8 14:01:35 2008
@@ -19,6 +19,8 @@
 
 package org.apache.axis2.phaserule;
 
+import java.util.List;
+
 import org.apache.axis2.AbstractTestCase;
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
@@ -28,8 +30,6 @@
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseHolder;
 
-import java.util.ArrayList;
-
 public class PreDispatchPhaseRuleTest extends AbstractTestCase {
 
     PreDispatchPhaseRuleTest phaserul;
@@ -43,7 +43,7 @@
         //TODO Fix me
         phaserul = new PreDispatchPhaseRuleTest("");
         axisSytem = new AxisConfiguration();
-        ArrayList inPhase = axisSytem.getInFlowPhases();
+        List inPhase = axisSytem.getInFlowPhases();
         Phase transportIN = new Phase("TransportIn");
         Phase preDispatch = new Phase("PreDispatch");
         DispatchPhase dispatchPhase = new DispatchPhase();



Mime
View raw message