You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/06/18 12:28:21 UTC
svn commit: r1603398 - in /tomee/javaee-api/trunk: ./
src/main/java/javax/ws/rs/core/ src/main/java/javax/xml/bind/
src/main/java/org/apache/openejb/javaee/api/activator/
src/main/java/org/apache/openejb/javaee/api/activator/org/apache/openejb/javaee/a...
Author: andygumbrecht
Date: Wed Jun 18 10:28:21 2014
New Revision: 1603398
URL: http://svn.apache.org/r1603398
Log:
Do not create dependency-reduced-pom.xml
Finals and formatting
Ignore .idea
Modified:
tomee/javaee-api/trunk/ (props changed)
tomee/javaee-api/trunk/pom.xml
tomee/javaee-api/trunk/src/main/java/javax/ws/rs/core/UriBuilder.java
tomee/javaee-api/trunk/src/main/java/javax/xml/bind/ContextFinder.java
tomee/javaee-api/trunk/src/main/java/javax/xml/bind/DatatypeConverter.java
tomee/javaee-api/trunk/src/main/java/org/apache/openejb/javaee/api/activator/MultiActivator.java
tomee/javaee-api/trunk/src/main/java/org/apache/openejb/javaee/api/activator/org/apache/openejb/javaee/api/locator/ProviderLocator.java
Propchange: tomee/javaee-api/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jun 18 10:28:21 2014
@@ -1,11 +1,11 @@
-*.iws
-*.ipr
*.iml
+*.ipr
+*.iws
+*.log
.classpath
+.idea
.project
.settings
-*.log
+bin
junit*.properties
target
-bin
-
Modified: tomee/javaee-api/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/javaee-api/trunk/pom.xml?rev=1603398&r1=1603397&r2=1603398&view=diff
==============================================================================
--- tomee/javaee-api/trunk/pom.xml (original)
+++ tomee/javaee-api/trunk/pom.xml Wed Jun 18 10:28:21 2014
@@ -156,6 +156,8 @@
</goals>
<configuration>
<createSourcesJar>true</createSourcesJar>
+ <useBaseVersion>true</useBaseVersion>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
<artifactSet>
<excludes>
<exclude>*:*:sources</exclude>
Modified: tomee/javaee-api/trunk/src/main/java/javax/ws/rs/core/UriBuilder.java
URL: http://svn.apache.org/viewvc/tomee/javaee-api/trunk/src/main/java/javax/ws/rs/core/UriBuilder.java?rev=1603398&r1=1603397&r2=1603398&view=diff
==============================================================================
--- tomee/javaee-api/trunk/src/main/java/javax/ws/rs/core/UriBuilder.java (original)
+++ tomee/javaee-api/trunk/src/main/java/javax/ws/rs/core/UriBuilder.java Wed Jun 18 10:28:21 2014
@@ -19,37 +19,37 @@
package javax.ws.rs.core;
+import javax.ws.rs.ext.RuntimeDelegate;
import java.lang.reflect.Method;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Map;
-import javax.ws.rs.ext.RuntimeDelegate;
-
+@SuppressWarnings("UnusedDeclaration")
public abstract class UriBuilder {
protected UriBuilder() {
super();
}
- public static UriBuilder fromPath(String value) { // here geronimo was buggy
+ public static UriBuilder fromPath(final String value) { // here geronimo was buggy
return newInstance().path(value);
}
- public static UriBuilder fromResource(Class<?> resourceClass) {
+ public static UriBuilder fromResource(final Class<?> resourceClass) {
return newInstance().path(resourceClass);
}
- public static UriBuilder fromUri(String value) {
+ public static UriBuilder fromUri(final String value) {
try {
return fromUri(new URI(value));
- } catch (NullPointerException e) {
+ } catch (final NullPointerException e) {
throw new IllegalArgumentException(e);
- } catch (URISyntaxException e) {
+ } catch (final URISyntaxException e) {
throw new IllegalArgumentException(e);
}
}
- public static UriBuilder fromUri(URI uri) {
+ public static UriBuilder fromUri(final URI uri) {
return newInstance().uri(uri);
}
@@ -68,7 +68,7 @@ public abstract class UriBuilder {
public abstract URI buildFromMap(Map<String, ? extends Object> values);
@Override
- public abstract UriBuilder clone();
+ public abstract UriBuilder clone() throws CloneNotSupportedException;
public abstract UriBuilder fragment(String value);
Modified: tomee/javaee-api/trunk/src/main/java/javax/xml/bind/ContextFinder.java
URL: http://svn.apache.org/viewvc/tomee/javaee-api/trunk/src/main/java/javax/xml/bind/ContextFinder.java?rev=1603398&r1=1603397&r2=1603398&view=diff
==============================================================================
--- tomee/javaee-api/trunk/src/main/java/javax/xml/bind/ContextFinder.java (original)
+++ tomee/javaee-api/trunk/src/main/java/javax/xml/bind/ContextFinder.java Wed Jun 18 10:28:21 2014
@@ -27,6 +27,7 @@ import java.io.InputStreamReader;
/**
* we use it to endorse tomee and we don't want to depend on OSGi as it is done in geronimo
*/
+@SuppressWarnings("UnusedDeclaration")
class ContextFinder {
private static final String PLATFORM_DEFAULT_FACTORY_CLASS = "com.sun.xml.bind.v2.ContextFactory";
@@ -42,22 +43,22 @@ class ContextFinder {
osgiLocator = Thread.currentThread().getContextClassLoader().loadClass("org.apache.geronimo.osgi.locator.ProviderLocator");
getServiceClassMethod = osgiLocator.getMethod("getServiceClass", String.class, Class.class, ClassLoader.class);
loadClassMethod = osgiLocator.getMethod("loadClass", String.class, Class.class, ClassLoader.class);
- } catch (Exception e) {
+ } catch (final Exception e) {
osgiLocator = null;
- } catch (NoClassDefFoundError ncdfe) {
+ } catch (final NoClassDefFoundError ncdfe) {
osgiLocator = null;
}
}
- public static JAXBContext find(String contextPath, ClassLoader classLoader, Map properties) throws JAXBException {
+ public static JAXBContext find(String contextPath, final ClassLoader classLoader, final Map properties) throws JAXBException {
contextPath = contextPath.trim();
if (contextPath.length() == 0 || contextPath.equals(":")) {
throw new JAXBException("Invalid contextPath");
}
String className = null;
- String[] packages = contextPath.split("[:]");
- for (String pkg : packages) {
- String url = pkg.replace('.', '/') + "/jaxb.properties";
+ final String[] packages = contextPath.split("[:]");
+ for (final String pkg : packages) {
+ final String url = pkg.replace('.', '/') + "/jaxb.properties";
className = loadClassNameFromProperties(url, classLoader);
if (className != null) {
break;
@@ -79,30 +80,30 @@ class ContextFinder {
spi = loadSpi(className, classLoader);
}
try {
- Method m = spi.getMethod("createContext", new Class[] { String.class, ClassLoader.class, Map.class });
+ final Method m = spi.getMethod("createContext", new Class[] { String.class, ClassLoader.class, Map.class });
return (JAXBContext) m.invoke(null, new Object[] { contextPath, classLoader, properties });
- } catch (NoSuchMethodException e) {
+ } catch (final NoSuchMethodException e) {
// will try JAXB 1.0 compatible createContext() method
- } catch (Throwable t) {
+ } catch (final Throwable t) {
throw new JAXBException("Unable to create context", t);
}
// try old JAXB 1.0 compatible createContext() method
try {
- Method m = spi.getMethod("createContext", new Class[] { String.class, ClassLoader.class });
+ final Method m = spi.getMethod("createContext", new Class[] { String.class, ClassLoader.class });
return (JAXBContext) m.invoke(null, new Object[] { contextPath, classLoader });
- } catch (Throwable t) {
+ } catch (final Throwable t) {
throw new JAXBException("Unable to create context", t);
}
}
- public static JAXBContext find(Class[] classes, Map properties) throws JAXBException {
+ public static JAXBContext find(final Class[] classes, final Map properties) throws JAXBException {
String className = null;
- for (Class cl : classes) {
- Package pkg = cl.getPackage();
+ for (final Class cl : classes) {
+ final Package pkg = cl.getPackage();
if (pkg != null) {
- String url = pkg.getName().replace('.', '/') + "/jaxb.properties";
+ final String url = pkg.getName().replace('.', '/') + "/jaxb.properties";
className = loadClassNameFromProperties(url, cl.getClassLoader());
if (className != null) {
break;
@@ -112,7 +113,7 @@ class ContextFinder {
if (className == null) {
className = System.getProperty(JAXB_CONTEXT_PROPERTY);
}
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
Class spi = null;
// if no specifically specified name, check for META-INF/services, and
@@ -127,16 +128,16 @@ class ContextFinder {
spi = loadSpi(className, classLoader);
}
try {
- Method m = spi.getMethod("createContext", new Class[] { Class[].class, Map.class });
+ final Method m = spi.getMethod("createContext", new Class[] { Class[].class, Map.class });
return (JAXBContext) m.invoke(null, new Object[] { classes, properties });
- } catch (Throwable t) {
+ } catch (final Throwable t) {
throw new JAXBException("Unable to create context", t);
}
}
- private static String loadClassNameFromProperties(String url, ClassLoader classLoader) throws JAXBException {
+ private static String loadClassNameFromProperties(final String url, final ClassLoader classLoader) throws JAXBException {
try {
- InputStream is;
+ final InputStream is;
if (classLoader != null) {
is = classLoader.getResourceAsStream(url);
} else {
@@ -144,9 +145,9 @@ class ContextFinder {
}
if (is != null) {
try {
- Properties props = new Properties();
+ final Properties props = new Properties();
props.load(is);
- String className = props.getProperty(JAXB_CONTEXT_FACTORY);
+ final String className = props.getProperty(JAXB_CONTEXT_FACTORY);
if (className == null) {
throw new JAXBException("jaxb.properties file " + url + " should contain a " + JAXB_CONTEXT_FACTORY + " property");
}
@@ -157,25 +158,25 @@ class ContextFinder {
} else {
return null;
}
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new JAXBException(e);
}
}
- private static Class<?> loadSPIClass(Class<?> iface, ClassLoader classLoader) throws JAXBException {
+ private static Class<?> loadSPIClass(final Class<?> iface, final ClassLoader classLoader) throws JAXBException {
if (osgiLocator != null) {
return loadSPIClassFromOSGi(iface, classLoader);
}
try {
return locateServiceClass(iface.getName(), ContextFinder.class, classLoader);
- } catch (ClassNotFoundException e) {
+ } catch (final ClassNotFoundException e) {
throw new JAXBException("Provider " + iface.getName() + " not found", e);
}
}
- static private Class<?> locateServiceClass(String iface, Class<?> contextClass, ClassLoader loader) throws ClassNotFoundException {
- String className = locateServiceClassName(iface, contextClass, loader);
+ static private Class<?> locateServiceClass(final String iface, final Class<?> contextClass, final ClassLoader loader) throws ClassNotFoundException {
+ final String className = locateServiceClassName(iface, contextClass, loader);
if (className == null) {
return null;
}
@@ -184,7 +185,7 @@ class ContextFinder {
return loadClass(className, contextClass, loader);
}
- static private String locateServiceClassName(String iface, Class<?> contextClass, ClassLoader loader) {
+ static private String locateServiceClassName(final String iface, final Class<?> contextClass, final ClassLoader loader) {
// search first with the loader class path
String name = locateServiceClassName(iface, loader);
if (name != null) {
@@ -201,32 +202,33 @@ class ContextFinder {
return null;
}
- static private String locateServiceClassName(String iface, ClassLoader loader) {
+ static private String locateServiceClassName(final String iface, final ClassLoader loader) {
if (loader != null) {
try {
// we only look at resources that match the file name, using the specified loader
- String service = "META-INF/services/" + iface;
- Enumeration<URL> providers = loader.getResources(service);
+ final String service = "META-INF/services/" + iface;
+ final Enumeration<URL> providers = loader.getResources(service);
while (providers.hasMoreElements()) {
- List<String>providerNames = parseServiceDefinition(providers.nextElement());
+ final List<String>providerNames = parseServiceDefinition(providers.nextElement());
// if there is something defined here, return the first entry
if (!providerNames.isEmpty()) {
return providerNames.get(0);
}
}
- } catch (IOException e) {
+ } catch (final IOException e) {
}
}
// not found
return null;
}
- static public Class<?> loadClass(String className, Class<?> contextClass, ClassLoader loader) throws ClassNotFoundException {
+ static public Class<?> loadClass(final String className, final Class<?> contextClass, ClassLoader loader) throws ClassNotFoundException {
if (loader != null) {
try {
return loader.loadClass(className);
- } catch (ClassNotFoundException x) {
+ } catch (final ClassNotFoundException x) {
+ //ignore
}
}
if (contextClass != null) {
@@ -236,8 +238,8 @@ class ContextFinder {
return Class.forName(className, true, loader);
}
- static private Collection<String> locateServiceClassNames(String iface, Class<?> contextClass, ClassLoader loader) {
- Set<String> names = new LinkedHashSet<String>();
+ static private Collection<String> locateServiceClassNames(final String iface, final Class<?> contextClass, final ClassLoader loader) {
+ final Set<String> names = new LinkedHashSet<String>();
locateServiceClassNames(iface, loader, names);
if (contextClass != null) {
@@ -247,27 +249,28 @@ class ContextFinder {
return names;
}
- static void locateServiceClassNames(String iface, ClassLoader loader, Set names) {
+ static void locateServiceClassNames(final String iface, final ClassLoader loader, final Set names) {
if (loader != null) {
try {
// we only look at resources that match the file name, using the specified loader
- String service = "META-INF/services/" + iface;
- Enumeration<URL> providers = loader.getResources(service);
+ final String service = "META-INF/services/" + iface;
+ final Enumeration<URL> providers = loader.getResources(service);
while (providers.hasMoreElements()) {
- List<String>providerNames = parseServiceDefinition(providers.nextElement());
+ final List<String>providerNames = parseServiceDefinition(providers.nextElement());
// just add all of these to the list
names.addAll(providerNames);
}
- } catch (IOException e) {
+ } catch (final IOException e) {
+ //Ignore
}
}
}
- static private List<String> parseServiceDefinition(URL u) {
+ static private List<String> parseServiceDefinition(final URL u) {
final String url = u.toString();
- List<String> classes = new ArrayList<String>();
+ final List<String> classes = new ArrayList<String>();
// ignore directories
if (url.endsWith("/")) {
return classes;
@@ -275,14 +278,14 @@ class ContextFinder {
// the identifier used for the provider is the last item in the URL.
final String providerId = url.substring(url.lastIndexOf("/") + 1);
try {
- BufferedReader br = new BufferedReader(new InputStreamReader(u.openStream(), "UTF-8"));
+ final BufferedReader br = new BufferedReader(new InputStreamReader(u.openStream(), "UTF-8"));
// the file can be multiple lines long, with comments. A single file can define multiple providers
// for a single key, so we might need to create multiple entries. If the file does not contain any
// definition lines, then as a default, we use the providerId as an implementation class also.
String line = br.readLine();
while (line != null) {
// we allow comments on these lines, and a line can be all comment
- int comment = line.indexOf('#');
+ final int comment = line.indexOf('#');
if (comment != -1) {
line = line.substring(0, comment);
}
@@ -296,36 +299,36 @@ class ContextFinder {
line = br.readLine();
}
br.close();
- } catch (IOException e) {
+ } catch (final IOException e) {
// ignore errors and handle as default
}
return classes;
}
- private static Class loadSpi(String className, ClassLoader classLoader) throws JAXBException {
+ private static Class loadSpi(final String className, final ClassLoader classLoader) throws JAXBException {
if (osgiLocator != null) {
return loadSpiFromOSGi(className, classLoader);
}
try {
return loadClass(className, ContextFinder.class, classLoader);
- } catch (ClassNotFoundException e) {
+ } catch (final ClassNotFoundException e) {
throw new JAXBException("Provider " + className + " not found", e);
}
}
- private static Class<?> loadSPIClassFromOSGi(Class<?> iface, ClassLoader classLoader) throws JAXBException {
+ private static Class<?> loadSPIClassFromOSGi(final Class<?> iface, final ClassLoader classLoader) throws JAXBException {
try {
return (Class<?>) getServiceClassMethod.invoke(null, iface.getName(), ContextFinder.class,classLoader);
- } catch (Exception e) {
+ } catch (final Exception e) {
return null;
}
}
- private static Class loadSpiFromOSGi(String className, ClassLoader classLoader) throws JAXBException {
+ private static Class loadSpiFromOSGi(final String className, final ClassLoader classLoader) throws JAXBException {
try {
return (Class<?>) loadClassMethod.invoke(null, className, ContextFinder.class, classLoader);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new JAXBException("Provider " + className + " not found", e);
}
}
Modified: tomee/javaee-api/trunk/src/main/java/javax/xml/bind/DatatypeConverter.java
URL: http://svn.apache.org/viewvc/tomee/javaee-api/trunk/src/main/java/javax/xml/bind/DatatypeConverter.java?rev=1603398&r1=1603397&r2=1603398&view=diff
==============================================================================
--- tomee/javaee-api/trunk/src/main/java/javax/xml/bind/DatatypeConverter.java (original)
+++ tomee/javaee-api/trunk/src/main/java/javax/xml/bind/DatatypeConverter.java Wed Jun 18 10:28:21 2014
@@ -16,13 +16,13 @@
*/
package javax.xml.bind;
-import java.util.Calendar;
-import java.math.BigInteger;
-import java.math.BigDecimal;
-
-import javax.xml.namespace.QName;
import javax.xml.namespace.NamespaceContext;
+import javax.xml.namespace.QName;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Calendar;
+@SuppressWarnings("UnusedDeclaration")
public final class DatatypeConverter {
private static DatatypeConverterInterface converter = new DatatypeConverterImpl();
@@ -31,13 +31,13 @@ public final class DatatypeConverter {
// no-op
}
- public static void setDatatypeConverter(DatatypeConverterInterface converter) {
+ public static void setDatatypeConverter(final DatatypeConverterInterface converter) {
if (converter == null) {
throw new IllegalArgumentException("The DatatypeConverterInterface parameter must not be null");
}
if (DatatypeConverter.converter == null) {
- SecurityManager sm = System.getSecurityManager();
+ final SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkPermission(new JAXBPermission("setDatatypeConverter"));
}
@@ -46,155 +46,155 @@ public final class DatatypeConverter {
}
}
- public static String parseString(String lexicalXSDString) {
+ public static String parseString(final String lexicalXSDString) {
return converter.parseString(lexicalXSDString);
}
- public static BigInteger parseInteger(String lexicalXSDInteger) {
+ public static BigInteger parseInteger(final String lexicalXSDInteger) {
return converter.parseInteger(lexicalXSDInteger);
}
- public static int parseInt(String lexicalXSDInt) {
+ public static int parseInt(final String lexicalXSDInt) {
return converter.parseInt(lexicalXSDInt);
}
- public static long parseLong(String lexicalXSDLong) {
+ public static long parseLong(final String lexicalXSDLong) {
return converter.parseLong(lexicalXSDLong);
}
- public static short parseShort(String lexicalXSDShort) {
+ public static short parseShort(final String lexicalXSDShort) {
return converter.parseShort(lexicalXSDShort);
}
- public static BigDecimal parseDecimal(String lexicalXSDDecimal) {
+ public static BigDecimal parseDecimal(final String lexicalXSDDecimal) {
return converter.parseDecimal(lexicalXSDDecimal);
}
- public static float parseFloat(String lexicalXSDFloat) {
+ public static float parseFloat(final String lexicalXSDFloat) {
return converter.parseFloat(lexicalXSDFloat);
}
- public static double parseDouble(String lexicalXSDDouble) {
+ public static double parseDouble(final String lexicalXSDDouble) {
return converter.parseDouble(lexicalXSDDouble);
}
- public static boolean parseBoolean(String lexicalXSDBoolean) {
+ public static boolean parseBoolean(final String lexicalXSDBoolean) {
return converter.parseBoolean(lexicalXSDBoolean);
}
- public static byte parseByte(String lexicalXSDByte) {
+ public static byte parseByte(final String lexicalXSDByte) {
return converter.parseByte(lexicalXSDByte);
}
- public static QName parseQName(String lexicalXSDQName, NamespaceContext nsc) {
+ public static QName parseQName(final String lexicalXSDQName, final NamespaceContext nsc) {
return converter.parseQName(lexicalXSDQName, nsc);
}
- public static Calendar parseDateTime(String lexicalXSDDateTime) {
+ public static Calendar parseDateTime(final String lexicalXSDDateTime) {
return converter.parseDateTime(lexicalXSDDateTime);
}
- public static byte[] parseBase64Binary(String lexicalXSDBase64Binary) {
+ public static byte[] parseBase64Binary(final String lexicalXSDBase64Binary) {
return converter.parseBase64Binary(lexicalXSDBase64Binary);
}
- public static byte[] parseHexBinary(String lexicalXSDHexBinary) {
+ public static byte[] parseHexBinary(final String lexicalXSDHexBinary) {
return converter.parseHexBinary(lexicalXSDHexBinary);
}
- public static long parseUnsignedInt(String lexicalXSDUnsignedInt) {
+ public static long parseUnsignedInt(final String lexicalXSDUnsignedInt) {
return converter.parseUnsignedInt(lexicalXSDUnsignedInt);
}
- public static int parseUnsignedShort(String lexicalXSDUnsignedShort) {
+ public static int parseUnsignedShort(final String lexicalXSDUnsignedShort) {
return converter.parseUnsignedShort(lexicalXSDUnsignedShort);
}
- public static Calendar parseTime(String lexicalXSDTime) {
+ public static Calendar parseTime(final String lexicalXSDTime) {
return converter.parseTime(lexicalXSDTime);
}
- public static Calendar parseDate(String lexicalXSDDate) {
+ public static Calendar parseDate(final String lexicalXSDDate) {
return converter.parseDate(lexicalXSDDate);
}
- public static String parseAnySimpleType(String lexicalXSDAnySimpleType) {
+ public static String parseAnySimpleType(final String lexicalXSDAnySimpleType) {
return converter.parseAnySimpleType(lexicalXSDAnySimpleType);
}
- public static String printString(String val) {
+ public static String printString(final String val) {
return converter.printString(val);
}
- public static String printInteger(BigInteger val) {
+ public static String printInteger(final BigInteger val) {
return converter.printInteger(val);
}
- public static String printInt(int val) {
+ public static String printInt(final int val) {
return converter.printInt(val);
}
- public static String printLong(long val) {
+ public static String printLong(final long val) {
return converter.printLong(val);
}
- public static String printShort(short val) {
+ public static String printShort(final short val) {
return converter.printShort(val);
}
- public static String printDecimal(BigDecimal val) {
+ public static String printDecimal(final BigDecimal val) {
return converter.printDecimal(val);
}
- public static String printFloat(float val) {
+ public static String printFloat(final float val) {
return converter.printFloat(val);
}
- public static String printDouble(double val) {
+ public static String printDouble(final double val) {
return converter.printDouble(val);
}
- public static String printBoolean(boolean val) {
+ public static String printBoolean(final boolean val) {
return converter.printBoolean(val);
}
- public static String printByte(byte val) {
+ public static String printByte(final byte val) {
return converter.printByte(val);
}
- public static String printQName(QName val, NamespaceContext nsc) {
+ public static String printQName(final QName val, final NamespaceContext nsc) {
return converter.printQName(val, nsc);
}
- public static String printDateTime(Calendar val) {
+ public static String printDateTime(final Calendar val) {
return converter.printDateTime(val);
}
- public static String printBase64Binary(byte val[]) {
+ public static String printBase64Binary(final byte[] val) {
return converter.printBase64Binary(val);
}
- public static String printHexBinary(byte val[]) {
+ public static String printHexBinary(final byte[] val) {
return converter.printHexBinary(val);
}
- public static String printUnsignedInt(long val) {
+ public static String printUnsignedInt(final long val) {
return converter.printUnsignedInt(val);
}
- public static String printUnsignedShort(int val) {
+ public static String printUnsignedShort(final int val) {
return converter.printUnsignedShort(val);
}
- public static String printTime(Calendar val) {
+ public static String printTime(final Calendar val) {
return converter.printTime(val);
}
- public static String printDate(Calendar val) {
+ public static String printDate(final Calendar val) {
return converter.printDate(val);
}
- public static String printAnySimpleType(String val) {
+ public static String printAnySimpleType(final String val) {
return converter.printAnySimpleType(val);
}
Modified: tomee/javaee-api/trunk/src/main/java/org/apache/openejb/javaee/api/activator/MultiActivator.java
URL: http://svn.apache.org/viewvc/tomee/javaee-api/trunk/src/main/java/org/apache/openejb/javaee/api/activator/MultiActivator.java?rev=1603398&r1=1603397&r2=1603398&view=diff
==============================================================================
--- tomee/javaee-api/trunk/src/main/java/org/apache/openejb/javaee/api/activator/MultiActivator.java (original)
+++ tomee/javaee-api/trunk/src/main/java/org/apache/openejb/javaee/api/activator/MultiActivator.java Wed Jun 18 10:28:21 2014
@@ -34,13 +34,13 @@ public class MultiActivator implements B
private final org.apache.geronimo.specs.activation.Activator activation = new org.apache.geronimo.specs.activation.Activator();
private final PersistenceActivator persistence = new PersistenceActivator();
- public void start(BundleContext bundleContext) throws Exception {
+ public void start(final BundleContext bundleContext) throws Exception {
locator.start(bundleContext);
activation.start(bundleContext);
persistence.start(bundleContext);
}
- public void stop(BundleContext bundleContext) throws Exception {
+ public void stop(final BundleContext bundleContext) throws Exception {
persistence.stop(bundleContext);
activation.stop(bundleContext);
locator.stop(bundleContext);
Modified: tomee/javaee-api/trunk/src/main/java/org/apache/openejb/javaee/api/activator/org/apache/openejb/javaee/api/locator/ProviderLocator.java
URL: http://svn.apache.org/viewvc/tomee/javaee-api/trunk/src/main/java/org/apache/openejb/javaee/api/activator/org/apache/openejb/javaee/api/locator/ProviderLocator.java?rev=1603398&r1=1603397&r2=1603398&view=diff
==============================================================================
--- tomee/javaee-api/trunk/src/main/java/org/apache/openejb/javaee/api/activator/org/apache/openejb/javaee/api/locator/ProviderLocator.java (original)
+++ tomee/javaee-api/trunk/src/main/java/org/apache/openejb/javaee/api/activator/org/apache/openejb/javaee/api/locator/ProviderLocator.java Wed Jun 18 10:28:21 2014
@@ -33,6 +33,7 @@ import java.util.List;
import java.util.Properties;
import java.util.Set;
+@SuppressWarnings("UnusedDeclaration")
public class ProviderLocator {
// our bundle context
static private Object context;
@@ -49,7 +50,7 @@ public class ProviderLocator {
try {
bundleContextClazz = cl.loadClass("org.osgi.framework.BundleContext");
serviceTrackerClazz = cl.loadClass("org.osgi.util.tracker.ServiceTracker");
- } catch (ClassNotFoundException e) {
+ } catch (final ClassNotFoundException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
}
@@ -69,7 +70,7 @@ public class ProviderLocator {
* @exception ClassNotFoundException
* Thrown if the class cannot be located.
*/
- static public Class<?> loadClass(String className) throws ClassNotFoundException {
+ static public Class<?> loadClass(final String className) throws ClassNotFoundException {
return loadClass(className, null, Thread.currentThread().getContextClassLoader());
}
@@ -84,7 +85,7 @@ public class ProviderLocator {
* @exception ClassNotFoundException
* Thrown if the class cannot be located.
*/
- static public Class<?> loadClass(String className, Class<?> contextClass) throws ClassNotFoundException {
+ static public Class<?> loadClass(final String className, final Class<?> contextClass) throws ClassNotFoundException {
return loadClass(className, contextClass, Thread.currentThread().getContextClassLoader());
}
@@ -99,11 +100,12 @@ public class ProviderLocator {
* @exception ClassNotFoundException
* Thrown if the class cannot be loaded.
*/
- static public Class<?> loadClass(String className, Class<?>contextClass, ClassLoader loader) throws ClassNotFoundException {
+ static public Class<?> loadClass(final String className, final Class<?>contextClass, ClassLoader loader) throws ClassNotFoundException {
if (loader != null) {
try {
return loader.loadClass(className);
- } catch (ClassNotFoundException x) {
+ } catch (final ClassNotFoundException x) {
+ //ignore
}
}
if (contextClass != null) {
@@ -129,10 +131,10 @@ public class ProviderLocator {
* @exception Exception Thrown for any classloading or exceptions thrown
* trying to instantiate a service instance.
*/
- static public Object getService(String iface, Class<?> contextClass, ClassLoader loader) throws Exception {
+ static public Object getService(final String iface, final Class<?> contextClass, final ClassLoader loader) throws Exception {
// try for a classpath locatable instance next. If we find an appropriate class mapping,
// create an instance and return it.
- Class<?> cls = locateServiceClass(iface, contextClass, loader);
+ final Class<?> cls = locateServiceClass(iface, contextClass, loader);
if (cls != null) {
return cls.newInstance();
}
@@ -156,7 +158,7 @@ public class ProviderLocator {
* @exception Exception Thrown for any classloading exceptions thrown
* trying to load the class.
*/
- static public Class<?> getServiceClass(String iface, Class<?> contextClass, ClassLoader loader) throws ClassNotFoundException {
+ static public Class<?> getServiceClass(final String iface, final Class<?> contextClass, final ClassLoader loader) throws ClassNotFoundException {
return locateServiceClass(iface, contextClass, loader);
}
@@ -177,15 +179,15 @@ public class ProviderLocator {
* @exception Exception Thrown for any classloading or exceptions thrown
* trying to instantiate a service instance.
*/
- static public List<Object> getServices(String iface, Class<?> contextClass, ClassLoader loader) throws Exception {
- List<Object> services = new ArrayList<Object>();
+ static public List<Object> getServices(final String iface, final Class<?> contextClass, final ClassLoader loader) throws Exception {
+ final List<Object> services = new ArrayList<Object>();
// try for a classpath locatable instance second. If we find an appropriate class mapping,
// create an instance and return it.
- Collection<Class<?>> classes = locateServiceClasses(iface, contextClass, loader);
+ final Collection<Class<?>> classes = locateServiceClasses(iface, contextClass, loader);
if (classes != null) {
// create an instance of each of these classes
- for (Class<?> cls : classes) {
+ for (final Class<?> cls : classes) {
services.add(cls.newInstance());
}
}
@@ -211,12 +213,12 @@ public class ProviderLocator {
* @exception Exception Thrown for any classloading exceptions thrown
* trying to load a provider class.
*/
- static public List<Class<?>> getServiceClasses(String iface, Class<?> contextClass, ClassLoader loader) throws Exception {
- Set<Class<?>> serviceClasses = new LinkedHashSet<Class<?>>();
+ static public List<Class<?>> getServiceClasses(final String iface, final Class<?> contextClass, final ClassLoader loader) throws Exception {
+ final Set<Class<?>> serviceClasses = new LinkedHashSet<Class<?>>();
// try for a classpath locatable classes second. If we find an appropriate class mapping,
// add this to our return collection.
- Collection<Class<?>> classes = locateServiceClasses(iface, contextClass, loader);
+ final Collection<Class<?>> classes = locateServiceClasses(iface, contextClass, loader);
if (classes != null) {
serviceClasses.addAll(classes);
}
@@ -236,7 +238,7 @@ public class ProviderLocator {
* @return The mapped provider name, if found. Returns null if
* no mapping is located.
*/
- static private String locateServiceClassName(String iface, Class<?> contextClass, ClassLoader loader) {
+ static private String locateServiceClassName(final String iface, final Class<?> contextClass, final ClassLoader loader) {
// search first with the loader class path
String name = locateServiceClassName(iface, loader);
if (name != null) {
@@ -263,21 +265,22 @@ public class ProviderLocator {
* @return The mapped class name, if one is found. Returns null if the
* mapping is not located.
*/
- static private String locateServiceClassName(String iface, ClassLoader loader) {
+ static private String locateServiceClassName(final String iface, final ClassLoader loader) {
if (loader != null) {
try {
// we only look at resources that match the file name, using the specified loader
- String service = "META-INF/services/" + iface;
- Enumeration<URL> providers = loader.getResources(service);
+ final String service = "META-INF/services/" + iface;
+ final Enumeration<URL> providers = loader.getResources(service);
while (providers.hasMoreElements()) {
- List<String>providerNames = parseServiceDefinition(providers.nextElement());
+ final List<String>providerNames = parseServiceDefinition(providers.nextElement());
// if there is something defined here, return the first entry
if (!providerNames.isEmpty()) {
return providerNames.get(0);
}
}
- } catch (IOException e) {
+ } catch (final IOException e) {
+ //ignore
}
}
// not found
@@ -296,8 +299,8 @@ public class ProviderLocator {
* @return The mapped provider class, if found. Returns null if
* no mapping is located.
*/
- static private Class<?> locateServiceClass(String iface, Class<?> contextClass, ClassLoader loader) throws ClassNotFoundException {
- String className = locateServiceClassName(iface, contextClass, loader);
+ static private Class<?> locateServiceClass(final String iface, final Class<?> contextClass, final ClassLoader loader) throws ClassNotFoundException {
+ final String className = locateServiceClassName(iface, contextClass, loader);
if (className == null) {
return null;
}
@@ -317,8 +320,8 @@ public class ProviderLocator {
* @return The mapped provider name, if found. Returns null if
* no mapping is located.
*/
- static private Collection<String> locateServiceClassNames(String iface, Class<?> contextClass, ClassLoader loader) {
- Set<String> names = new LinkedHashSet<String>();
+ static private Collection<String> locateServiceClassNames(final String iface, final Class<?> contextClass, final ClassLoader loader) {
+ final Set<String> names = new LinkedHashSet<String>();
locateServiceClassNames(iface, loader, names);
if (contextClass != null) {
@@ -339,20 +342,20 @@ public class ProviderLocator {
* @return The mapped provider name, if found. Returns null if
* no mapping is located.
*/
- static void locateServiceClassNames(String iface, ClassLoader loader, Set names) {
+ static void locateServiceClassNames(final String iface, final ClassLoader loader, final Set names) {
if (loader != null) {
try {
// we only look at resources that match the file name, using the specified loader
- String service = "META-INF/services/" + iface;
- Enumeration<URL> providers = loader.getResources(service);
+ final String service = "META-INF/services/" + iface;
+ final Enumeration<URL> providers = loader.getResources(service);
while (providers.hasMoreElements()) {
- List<String>providerNames = parseServiceDefinition(providers.nextElement());
+ final List<String>providerNames = parseServiceDefinition(providers.nextElement());
// just add all of these to the list
names.addAll(providerNames);
}
- } catch (IOException e) {
+ } catch (final IOException e) {
}
}
}
@@ -369,13 +372,13 @@ public class ProviderLocator {
* @return A list of all mapped classes, if found. Returns an empty list if
* no mappings are found.
*/
- static private Collection<Class<?>> locateServiceClasses(String iface, Class<?> contextClass, ClassLoader loader) throws ClassNotFoundException {
+ static private Collection<Class<?>> locateServiceClasses(final String iface, final Class<?> contextClass, final ClassLoader loader) throws ClassNotFoundException {
// get the set of names from services definitions on the classpath
- Collection<String> classNames = locateServiceClassNames(iface, contextClass, loader);
- Set<Class<?>> classes = new LinkedHashSet<Class<?>>();
+ final Collection<String> classNames = locateServiceClassNames(iface, contextClass, loader);
+ final Set<Class<?>> classes = new LinkedHashSet<Class<?>>();
// load each class and add to our return set
- for (String name : classNames) {
+ for (final String name : classNames) {
classes.add(loadClass(name, contextClass, loader));
}
return classes;
@@ -391,9 +394,9 @@ public class ProviderLocator {
* @return A list of all matching classes. Returns an empty list
* if no matches are found.
*/
- static private List<String> parseServiceDefinition(URL u) {
+ static private List<String> parseServiceDefinition(final URL u) {
final String url = u.toString();
- List<String> classes = new ArrayList<String>();
+ final List<String> classes = new ArrayList<String>();
// ignore directories
if (url.endsWith("/")) {
return classes;
@@ -401,14 +404,14 @@ public class ProviderLocator {
// the identifier used for the provider is the last item in the URL.
final String providerId = url.substring(url.lastIndexOf("/") + 1);
try {
- BufferedReader br = new BufferedReader(new InputStreamReader(u.openStream(), "UTF-8"));
+ final BufferedReader br = new BufferedReader(new InputStreamReader(u.openStream(), "UTF-8"));
// the file can be multiple lines long, with comments. A single file can define multiple providers
// for a single key, so we might need to create multiple entries. If the file does not contain any
// definition lines, then as a default, we use the providerId as an implementation class also.
String line = br.readLine();
while (line != null) {
// we allow comments on these lines, and a line can be all comment
- int comment = line.indexOf('#');
+ final int comment = line.indexOf('#');
if (comment != -1) {
line = line.substring(0, comment);
}
@@ -422,7 +425,7 @@ public class ProviderLocator {
line = br.readLine();
}
br.close();
- } catch (IOException e) {
+ } catch (final IOException e) {
// ignore errors and handle as default
}
return classes;
@@ -439,11 +442,11 @@ public class ProviderLocator {
* @return The value of the named property within the properties file. Returns
* null if the property doesn't exist or the properties file doesn't exist.
*/
- public static String lookupByJREPropertyFile(String path, String property) throws IOException {
- String jreDirectory = System.getProperty("java.home");
- File configurationFile = new File(jreDirectory + File.separator + path);
+ public static String lookupByJREPropertyFile(final String path, final String property) throws IOException {
+ final String jreDirectory = System.getProperty("java.home");
+ final File configurationFile = new File(jreDirectory + File.separator + path);
if (configurationFile.exists() && configurationFile.canRead()) {
- Properties properties = new Properties();
+ final Properties properties = new Properties();
InputStream in = null;
try {
in = new FileInputStream(configurationFile);
@@ -453,7 +456,8 @@ public class ProviderLocator {
if (in != null) {
try {
in.close();
- } catch (Exception e) {
+ } catch (final Exception e) {
+ //ignore
}
}
}