JBossWS SVN: r10721 - stack/metro/trunk/modules/management/src/main/webapp.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-09-21 03:37:56 -0400 (Mon, 21 Sep 2009)
New Revision: 10721
Modified:
stack/metro/trunk/modules/management/src/main/webapp/index.html
Log:
[JBWS-2764]: fixed the wrong metro stack name in ws console
Modified: stack/metro/trunk/modules/management/src/main/webapp/index.html
===================================================================
--- stack/metro/trunk/modules/management/src/main/webapp/index.html 2009-09-21 07:37:17 UTC (rev 10720)
+++ stack/metro/trunk/modules/management/src/main/webapp/index.html 2009-09-21 07:37:56 UTC (rev 10721)
@@ -19,7 +19,7 @@
<fieldset>
<legend><b>Runtime information</b></legend>
<ul>
- <li><b>Version: jbossws-native-@version@</b></li>
+ <li><b>Version: jbossws-metro-@version@</b></li>
<li><b>Build: @buildNumber@</b></li>
<li><a href="services">View a list of deployed services</a></li>
<li><a href="/jmx-console/">Access JMX console</a></li>
15 years, 3 months
JBossWS SVN: r10720 - stack/cxf/trunk/modules/management/src/main/webapp.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-09-21 03:37:17 -0400 (Mon, 21 Sep 2009)
New Revision: 10720
Modified:
stack/cxf/trunk/modules/management/src/main/webapp/index.html
Log:
[JBWS-2764]: fixed the wrong cxf stack name in ws console
Modified: stack/cxf/trunk/modules/management/src/main/webapp/index.html
===================================================================
--- stack/cxf/trunk/modules/management/src/main/webapp/index.html 2009-09-21 06:15:36 UTC (rev 10719)
+++ stack/cxf/trunk/modules/management/src/main/webapp/index.html 2009-09-21 07:37:17 UTC (rev 10720)
@@ -19,7 +19,7 @@
<fieldset>
<legend><b>Runtime information</b></legend>
<ul>
- <li><b>Version: jbossws-native-@version@</b></li>
+ <li><b>Version: jbossws-cxf-@version@</b></li>
<li><b>Build: @buildNumber@</b></li>
<li><a href="services">View a list of deployed services</a></li>
<li><a href="/jmx-console/">Access JMX console</a></li>
15 years, 3 months
JBossWS SVN: r10719 - stack/native/trunk/modules/jaxws.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-09-21 02:15:36 -0400 (Mon, 21 Sep 2009)
New Revision: 10719
Modified:
stack/native/trunk/modules/jaxws/
Log:
remove back slash
Property changes on: stack/native/trunk/modules/jaxws
___________________________________________________________________
Name: svn:ignore
- target/
+ target
15 years, 3 months
JBossWS SVN: r10718 - stack/native/trunk/modules/jaxws.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-09-21 02:14:17 -0400 (Mon, 21 Sep 2009)
New Revision: 10718
Modified:
stack/native/trunk/modules/jaxws/
Log:
exclude target/ directory
Property changes on: stack/native/trunk/modules/jaxws
___________________________________________________________________
Name: svn:ignore
+ target/
15 years, 3 months
JBossWS SVN: r10717 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-09-18 12:49:47 -0400 (Fri, 18 Sep 2009)
New Revision: 10717
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java
Log:
[JBPAPP-2825] WSDL_DESCRIPTION population in MessageContext badly affects performances
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2009-09-18 16:41:28 UTC (rev 10716)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2009-09-18 16:49:47 UTC (rev 10717)
@@ -24,6 +24,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.net.URISyntaxException;
import java.net.URL;
import javax.xml.ws.handler.MessageContext;
@@ -127,7 +128,7 @@
{
super.setOperationMetaData(opMetaData);
- // [JBWS-2031] Implement standard message context properties
+ // [JBWS-2013] Implement standard message context properties
if (opMetaData != null)
{
EndpointMetaData epMetaData = opMetaData.getEndpointMetaData();
@@ -138,14 +139,11 @@
{
try
{
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- IOUtils.copyStream(baos, wsdlURL.openStream()); // [JBWS-2325] ensure file descriptors are closed
- InputSource inputSource = new InputSource(new ByteArrayInputStream(baos.toByteArray()));
- put(MessageContext.WSDL_DESCRIPTION, inputSource);
+ put(MessageContext.WSDL_DESCRIPTION, wsdlURL.toURI());
}
- catch (IOException ex)
+ catch (URISyntaxException e)
{
- throw new WSException("Cannot open: " + wsdlURL);
+ log.warn("Cannot get the wsdl url", e);
}
}
15 years, 3 months
JBossWS SVN: r10716 - stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/handler.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-09-18 12:41:28 -0400 (Fri, 18 Sep 2009)
New Revision: 10716
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java
Log:
[JBPAPP-2824] WSDL_DESCRIPTION population in MessageContext badly affects performances
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2009-09-18 16:16:29 UTC (rev 10715)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2009-09-18 16:41:28 UTC (rev 10716)
@@ -24,6 +24,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.net.URISyntaxException;
import java.net.URL;
import javax.xml.ws.handler.MessageContext;
@@ -125,7 +126,7 @@
{
super.setOperationMetaData(opMetaData);
- // [JBWS-2031] Implement standard message context properties
+ // [JBWS-2013] Implement standard message context properties
if (opMetaData != null)
{
EndpointMetaData epMetaData = opMetaData.getEndpointMetaData();
@@ -136,14 +137,11 @@
{
try
{
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- IOUtils.copyStream(baos, wsdlURL.openStream()); // [JBWS-2325] ensure file descriptors are closed
- InputSource inputSource = new InputSource(new ByteArrayInputStream(baos.toByteArray()));
- put(MessageContext.WSDL_DESCRIPTION, inputSource);
+ put(MessageContext.WSDL_DESCRIPTION, wsdlURL.toURI());
}
- catch (IOException ex)
+ catch (URISyntaxException e)
{
- throw new WSException("Cannot open: " + wsdlURL);
+ log.warn("Cannot get the wsdl url", e);
}
}
15 years, 3 months
JBossWS SVN: r10715 - in stack/native/trunk/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/jaxws/jbws2565 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-09-18 12:16:29 -0400 (Fri, 18 Sep 2009)
New Revision: 10715
Removed:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/MyWebServiceBeanWrong.java
Modified:
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/JBWS2565TestCase.java
Log:
[JBWS-2762] Relax restriction on @WebContext(authMethod).
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2009-09-18 16:12:39 UTC (rev 10714)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2009-09-18 16:16:29 UTC (rev 10715)
@@ -549,20 +549,6 @@
<include name="jboss-app.xml"/>
</metainf>
</jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2565-wrong.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws2565/MyWebServiceBeanWrong.class"/>
- </fileset>
- </jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2565-wrong.ear">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxws-jbws2565-wrong.jar"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2565/wrong/META-INF">
- <include name="application.xml"/>
- <include name="jboss-app.xml"/>
- </metainf>
- </jar>
<!-- jaxws-jbws2682 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2682.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2682/WEB-INF/web.xml">
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/JBWS2565TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/JBWS2565TestCase.java 2009-09-18 16:12:39 UTC (rev 10714)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/JBWS2565TestCase.java 2009-09-18 16:16:29 UTC (rev 10715)
@@ -56,19 +56,6 @@
final String[] serviceArgs = {};
final String result = (String) call.invoke(serviceArgs);
assertEquals("i've done stuff", result);
- }
+ }
- public void testWrongArchiveDeployment() throws Exception
- {
- try
- {
- this.deploy("jaxws-jbws2565-wrong.ear");
- fail("Deployment of this archive had to fail.");
- }
- catch (Exception ignore)
- {
- log.error("Expected exception caught:" + ignore.getMessage(), ignore);
- }
- }
-
}
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/MyWebServiceBeanWrong.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/MyWebServiceBeanWrong.java 2009-09-18 16:12:39 UTC (rev 10714)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/MyWebServiceBeanWrong.java 2009-09-18 16:16:29 UTC (rev 10715)
@@ -1,43 +0,0 @@
-/**
- *
- */
-package org.jboss.test.ws.jaxws.jbws2565;
-
-import javax.annotation.security.PermitAll;
-import javax.ejb.Stateless;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.jboss.wsf.spi.annotation.TransportGuarantee;
-import org.jboss.wsf.spi.annotation.WebContext;
-
-@Stateless
-@PermitAll
-@WebService
-(
- name = "MyWebService",
- targetNamespace = "http://my.services.web",
- serviceName = "MyWebServiceName"
-)
-@WebContext
-(
- contextRoot = "/jaxws-jbws2565-wrong",
- transportGuarantee = TransportGuarantee.NONE,
- authMethod = "NONE" // this is wrong value, deployment should be rejected
-)
-@SOAPBinding
-(
- use = SOAPBinding.Use.LITERAL,
- style = SOAPBinding.Style.DOCUMENT,
- parameterStyle = SOAPBinding.ParameterStyle.WRAPPED
-)
-public final class MyWebServiceBeanWrong
-{
- @WebMethod
- @PermitAll
- public final String doStuff()
- {
- return "i've done stuff";
- }
-}
15 years, 3 months
JBossWS SVN: r10714 - spi/trunk/src/main/java/org/jboss/wsf/spi/annotation.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-09-18 12:12:39 -0400 (Fri, 18 Sep 2009)
New Revision: 10714
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/annotation/AuthMethod.java
spi/trunk/src/main/java/org/jboss/wsf/spi/annotation/TransportGuarantee.java
spi/trunk/src/main/java/org/jboss/wsf/spi/annotation/WebContext.java
Log:
[JBWS-2762] Relax restriction on @WebContext(authMethod).
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/annotation/AuthMethod.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/annotation/AuthMethod.java 2009-09-18 16:02:44 UTC (rev 10713)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/annotation/AuthMethod.java 2009-09-18 16:12:39 UTC (rev 10714)
@@ -21,6 +21,8 @@
*/
package org.jboss.wsf.spi.annotation;
+import org.jboss.logging.Logger;
+
/**
* The authMethod is used to configure the authentication mechanism for the web service.
* As a prerequisite to gaining access to any web service which are protected by an
@@ -30,6 +32,7 @@
*/
public final class AuthMethod
{
+ private static final Logger log = Logger.getLogger(AuthMethod.class);
/**
* Basic authentication.
@@ -50,7 +53,7 @@
/**
* Returns string representing correct auth method value.
- * @param s string to convert, both lowercased and uppercased values are accepted
+ * @param s string to convert.
* @return correct auth method value
* @throws IllegalArgumentException if <b>s</b> is <b>null</b> or it contains unknown value.
*/
@@ -70,6 +73,8 @@
{
return AuthMethod.CLIENT_CERT;
}
+ log.warn("Non-standard auth method value: " + s);
+ return s;
}
throw new IllegalArgumentException("Illegal auth method value: " + s);
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/annotation/TransportGuarantee.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/annotation/TransportGuarantee.java 2009-09-18 16:02:44 UTC (rev 10713)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/annotation/TransportGuarantee.java 2009-09-18 16:12:39 UTC (rev 10714)
@@ -63,7 +63,7 @@
/**
* Returns string representing correct transport guarantee value.
- * @param s string to convert, both lowercased and uppercased values are accepted
+ * @param s string to convert.
* @return correct transport guarantee value
* @throws IllegalArgumentException if <b>s</b> is <b>null</b> or it contains unknown value.
*/
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/annotation/WebContext.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/annotation/WebContext.java 2009-09-18 16:02:44 UTC (rev 10713)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/annotation/WebContext.java 2009-09-18 16:12:39 UTC (rev 10714)
@@ -64,7 +64,8 @@
* As a prerequisite to gaining access to any web service which are protected by an authorization
* constraint, a user must have authenticated using the configured mechanism.
*
- * Legal values for this element are "BASIC", or "CLIENT-CERT".
+ * Standard values for this element are "BASIC", or "CLIENT-CERT", custom authMethods may also
+ * be specified.
*
* @see AuthMethod
*/
15 years, 3 months
JBossWS SVN: r10713 - spi/trunk/src/main/java/org/jboss/wsf/spi/util.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-09-18 12:02:44 -0400 (Fri, 18 Sep 2009)
New Revision: 10713
Removed:
spi/trunk/src/main/java/org/jboss/wsf/spi/util/ResourceCachingClassLoader.java
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java
Log:
[JBWS-2763] Store service api cache in a synchronized weak hash map in ServiceLoader and do not change classloaders
Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/util/ResourceCachingClassLoader.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/util/ResourceCachingClassLoader.java 2009-09-18 08:56:42 UTC (rev 10712)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/util/ResourceCachingClassLoader.java 2009-09-18 16:02:44 UTC (rev 10713)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.spi.util;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * A ClassLoader with caches for resource lookup through services (META-INF/services)
- *
- * @author alessio.soldano(a)jboss.com
- * @since 18-Sep-2009
- *
- */
-public class ResourceCachingClassLoader extends ClassLoader
-{
- private ConcurrentMap<String, String> servicesMap = new ConcurrentHashMap<String, String>();
-
- public ResourceCachingClassLoader(ClassLoader parent)
- {
- super(parent);
- //clear maps to same memory, as this constructor is also called when this classloader becomes a father (hence the cache is not useful anymore)
- servicesMap.clear();
- }
-
- public boolean hasResourceNameFromServices(String key)
- {
- return servicesMap.containsKey(key);
- }
-
- public String getResourceNameFromServices(String key)
- {
- return servicesMap.get(key);
- }
-
- public void setResourceNameFromServices(String key, String value)
- {
- servicesMap.put(key, value);
- }
-}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java 2009-09-18 08:56:42 UTC (rev 10712)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java 2009-09-18 16:02:44 UTC (rev 10713)
@@ -29,7 +29,11 @@
import java.io.InputStreamReader;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.Collections;
+import java.util.Map;
import java.util.Properties;
+import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* Load a service class using this ordered lookup procedure
@@ -41,6 +45,12 @@
public abstract class ServiceLoader
{
/**
+ * A synchronized weak hash map that keeps factory names retrieved using Service API (META-INF/services/*) for each classloader.
+ * Weak keys are used to remove entries when classloaders are garbage collected; values are service-property-name -> factory name maps.
+ */
+ private static Map<ClassLoader, Map<String, String>> serviceMap = Collections.synchronizedMap(new WeakHashMap<ClassLoader, Map<String, String>>());
+
+ /**
* This method uses the algorithm below using the JAXWS Provider as an example.
*
* 1. If a resource with the name of META-INF/services/javax.xml.ws.spi.Provider exists, then
@@ -75,61 +85,25 @@
{
Object factory = null;
String factoryName = null;
- ClassLoader cl = SecurityActions.getContextClassLoader();
- ResourceCachingClassLoader loader;
+ ClassLoader loader = SecurityActions.getContextClassLoader();
- if (cl instanceof ResourceCachingClassLoader)
- {
- loader = (ResourceCachingClassLoader)cl;
- }
- else
- {
- loader = new ResourceCachingClassLoader(cl);
- SecurityActions.setContextClassLoader(loader);
- }
-
// Use the Services API (as detailed in the JAR specification), if available, to determine the classname.
String filename = "META-INF/services/" + propertyName;
- if (loader.hasResourceNameFromServices(filename))
+
+ try
{
- factoryName = loader.getResourceNameFromServices(filename);
- try
+ factoryName = getServiceNameUsingCache(loader, filename);
+ if (factoryName != null)
{
- if (factoryName != null)
- {
- Class factoryClass = SecurityActions.loadClass(loader, factoryName);
- factory = factoryClass.newInstance();
- }
+ Class factoryClass = SecurityActions.loadClass(loader, factoryName);
+ factory = factoryClass.newInstance();
}
- catch (Throwable t)
- {
- throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
- }
}
- else
+ catch (Throwable t)
{
- InputStream inStream = SecurityActions.getResourceAsStream(loader, filename);
- if (inStream != null)
- {
- try
- {
- BufferedReader br = new BufferedReader(new InputStreamReader(inStream, "UTF-8"));
- factoryName = br.readLine();
- br.close();
- loader.setResourceNameFromServices(filename, factoryName);
- if (factoryName != null)
- {
- Class factoryClass = SecurityActions.loadClass(loader, factoryName);
- factory = factoryClass.newInstance();
- }
- }
- catch (Throwable t)
- {
- throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
- }
- }
+ throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
}
-
+
// Use the default factory implementation class.
if (factory == null && defaultFactory != null)
{
@@ -139,6 +113,33 @@
return factory;
}
+ private static String getServiceNameUsingCache(ClassLoader loader, String filename) throws IOException
+ {
+ Map<String, String> map = serviceMap.get(loader);
+ if (map != null && map.containsKey(filename))
+ {
+ return map.get(filename);
+ }
+ else
+ {
+ if (map == null)
+ {
+ map = new ConcurrentHashMap<String, String>();
+ serviceMap.put(loader, map);
+ }
+ InputStream inStream = SecurityActions.getResourceAsStream(loader, filename);
+ String factoryName = null;
+ if (inStream != null)
+ {
+ BufferedReader br = new BufferedReader(new InputStreamReader(inStream, "UTF-8"));
+ factoryName = br.readLine();
+ br.close();
+ map.put(filename, factoryName);
+ }
+ return factoryName;
+ }
+ }
+
/** Use the system property
*/
public static Object loadFromSystemProperty(String propertyName, String defaultFactory)
15 years, 3 months