Revision: 15689
Author: emmartins
Date: Thu Dec 9 10:17:54 2010
Log: misc fixes reported by find bugs
http://code.google.com/p/mobicents/source/detail?r=15689
Modified:
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/deployment/jaxb/descriptors/du/MDeployableUnit.java
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/deployment/jaxb/descriptors/ra/MResourceAdaptorClass.java
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/deployment/jaxb/descriptors/ra/MResourceAdaptorClasses.java
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/deployment/jaxb/descriptors/ratype/MResourceAdaptorTypeJar.java
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/security/PolicyHandler.java
=======================================
---
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/deployment/jaxb/descriptors/du/MDeployableUnit.java
Thu Jan 29 20:08:55 2009
+++
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/deployment/jaxb/descriptors/du/MDeployableUnit.java
Thu Dec 9 10:17:54 2010
@@ -17,9 +17,6 @@
*/
public class MDeployableUnit {
- private
org.mobicents.slee.container.component.deployment.jaxb.slee.du.DeployableUnit
deployableUnit10;
- private
org.mobicents.slee.container.component.deployment.jaxb.slee11.du.DeployableUnit
deployableUnit11;
-
private String description;
private List<String> jarEntries = new ArrayList<String>();
@@ -29,7 +26,6 @@
public
MDeployableUnit(org.mobicents.slee.container.component.deployment.jaxb.slee.du.DeployableUnit
deployableUnit10) throws DeploymentException
{
- this.deployableUnit10 = deployableUnit10;
this.description = deployableUnit10.getDescription() == null ? null :
deployableUnit10.getDescription().getvalue();
@@ -62,7 +58,6 @@
public
MDeployableUnit(org.mobicents.slee.container.component.deployment.jaxb.slee11.du.DeployableUnit
deployableUnit11) throws DeploymentException
{
- this.deployableUnit11 = deployableUnit11;
this.description = deployableUnit11.getDescription() == null ? null :
deployableUnit11.getDescription().getvalue();
=======================================
---
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/deployment/jaxb/descriptors/ra/MResourceAdaptorClass.java
Thu Mar 12 07:21:12 2009
+++
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/deployment/jaxb/descriptors/ra/MResourceAdaptorClass.java
Thu Dec 9 10:17:54 2010
@@ -11,17 +11,13 @@
* @author <a href="mailto:[email protected]"> Bartosz Baranowski </a>
*/
public class MResourceAdaptorClass {
-
- private
org.mobicents.slee.container.component.deployment.jaxb.slee11.ra.ResourceAdaptorClass
resourceAdaptorClass11;
protected boolean supportsActiveReconfiguration = false;
protected String description;
protected String resourceAdaptorClassName;
public
MResourceAdaptorClass(org.mobicents.slee.container.component.deployment.jaxb.slee11.ra.ResourceAdaptorClass
resourceAdaptorClass11)
- {
- this.resourceAdaptorClass11 = resourceAdaptorClass11;
-
+ {
if (resourceAdaptorClass11.getSupportsActiveReconfiguration() != null)
{
this.supportsActiveReconfiguration =
Boolean.parseBoolean(resourceAdaptorClass11.getSupportsActiveReconfiguration());
}
=======================================
---
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/deployment/jaxb/descriptors/ra/MResourceAdaptorClasses.java
Tue Mar 31 03:44:07 2009
+++
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/deployment/jaxb/descriptors/ra/MResourceAdaptorClasses.java
Thu Dec 9 10:17:54 2010
@@ -14,9 +14,6 @@
*/
public class MResourceAdaptorClasses {
- private
org.mobicents.slee.container.component.deployment.jaxb.slee.ra.ResourceAdaptorClasses
resourceAdaptorClasses10;
- private
org.mobicents.slee.container.component.deployment.jaxb.slee11.ra.ResourceAdaptorClasses
resourceAdaptorClasses11;
-
// For JAIN SLEE 1.0
private String resourceAdaptorClasses;
@@ -26,16 +23,12 @@
private MUsageParametersInterface
resourceAdaptorUsageParametersInterface;
public
MResourceAdaptorClasses(org.mobicents.slee.container.component.deployment.jaxb.slee.ra.ResourceAdaptorClasses
resourceAdaptorClasses10)
- {
- this.resourceAdaptorClasses10 = resourceAdaptorClasses10;
-
+ {
this.resourceAdaptorClasses = resourceAdaptorClasses10.getvalue();
}
public
MResourceAdaptorClasses(org.mobicents.slee.container.component.deployment.jaxb.slee11.ra.ResourceAdaptorClasses
resourceAdaptorClasses11)
{
- this.resourceAdaptorClasses11 = resourceAdaptorClasses11;
-
this.description = resourceAdaptorClasses11.getDescription() == null ?
null : resourceAdaptorClasses11.getDescription().getvalue();
this.resourceAdaptorClass = new
MResourceAdaptorClass(resourceAdaptorClasses11.getResourceAdaptorClass());
this.resourceAdaptorUsageParametersInterface =
resourceAdaptorClasses11.getResourceAdaptorUsageParametersInterface() ==
null ? null : new
MUsageParametersInterface(resourceAdaptorClasses11.getResourceAdaptorUsageParametersInterface());
=======================================
---
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/deployment/jaxb/descriptors/ratype/MResourceAdaptorTypeJar.java
Thu Jan 29 20:08:55 2009
+++
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/deployment/jaxb/descriptors/ratype/MResourceAdaptorTypeJar.java
Thu Dec 9 10:17:54 2010
@@ -15,16 +15,11 @@
*/
public class MResourceAdaptorTypeJar {
- private
org.mobicents.slee.container.component.deployment.jaxb.slee.ratype.ResourceAdaptorTypeJar
resourceAdaptorTypeJar10;
- private
org.mobicents.slee.container.component.deployment.jaxb.slee11.ratype.ResourceAdaptorTypeJar
resourceAdaptorTypeJar11;
-
private String description;
private List<MResourceAdaptorType> resourceAdaptorType = new
ArrayList<MResourceAdaptorType>();
public
MResourceAdaptorTypeJar(org.mobicents.slee.container.component.deployment.jaxb.slee.ratype.ResourceAdaptorTypeJar
resourceAdaptorTypeJar10)
- {
- this.resourceAdaptorTypeJar10 = resourceAdaptorTypeJar10;
-
+ {
this.description = resourceAdaptorTypeJar10.getDescription() == null ?
null : resourceAdaptorTypeJar10.getDescription().getvalue();
for(org.mobicents.slee.container.component.deployment.jaxb.slee.ratype.ResourceAdaptorType
resourceAdaptorType10 : resourceAdaptorTypeJar10.getResourceAdaptorType())
@@ -34,9 +29,7 @@
}
public
MResourceAdaptorTypeJar(org.mobicents.slee.container.component.deployment.jaxb.slee11.ratype.ResourceAdaptorTypeJar
resourceAdaptorTypeJar11)
- {
- this.resourceAdaptorTypeJar11 = resourceAdaptorTypeJar11;
-
+ {
this.description = resourceAdaptorTypeJar11.getDescription() == null ?
null : resourceAdaptorTypeJar11.getDescription().getvalue();
for(org.mobicents.slee.container.component.deployment.jaxb.slee11.ratype.ResourceAdaptorType
resourceAdaptorType11 : resourceAdaptorTypeJar11.getResourceAdaptorType())
=======================================
---
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/security/PolicyHandler.java
Mon Apr 26 08:37:10 2010
+++
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/security/PolicyHandler.java
Thu Dec 9 10:17:54 2010
@@ -8,17 +8,6 @@
*/
package org.mobicents.slee.container.component.security;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-
-import javax.slee.management.DeploymentException;
-
-import sun.security.provider.PolicyParser;
/**
* Start time:12:56:13 2009-04-08<br>
@@ -39,13 +28,10 @@
return policyHandler;
}
+ /*
private static final String _FILE_NAME = "local.policy";
private static final String _POLICY_PROP_URL = "policy.url.y";
- private List<URI> presentPolicyFiles = new ArrayList<URI>();
-
-
-
private void instrumentCodeBase(File deployURL, PolicyParser pp) throws
DeploymentException {
// Here we must instrument code base, so it either points to
whole dir,
@@ -73,10 +59,7 @@
}
}
}
- }
-
- private static int counter =1;
-
+ }
public static void main(String[] args) {
@@ -92,5 +75,6 @@
e.printStackTrace();
}
}
+ */
}