src/main/java/org/jboss/rails/runtime/deployers/as_logger.rb @@ -177,6 +177,7 @@ <classpathentry kind="var" path="M2_REPO/javax/xml/soap/saaj-api/1.3/saaj-api-1.3.jar" sourcepath="M2_REPO/javax/xml/soap/saaj-api/1.3/saaj-api-1.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/xalan/serializer/2.7.1/serializer-2.7.1.jar"/> <classpathentry kind="var" path="M2_REPO/jboss/web/servlet-api/2.1.1.GA/servlet-api-2.1.1.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-jboss5/0.9-SNAPSHOT/sip-servlets-jboss5-0.9-SNAPSHOT.jar"/> <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.2/slf4j-api-1.4.2.jar"/> <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.0.8/spring-beans-2.0.8.jar"/> <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/2.0.8/spring-context-2.0.8.jar"/> .classpath @@ -4,14 +4,10 @@ <projects/> <buildSpec> <buildCommand> - <name>org.rubypeople.rdt.core.rubybuilder</name> - </buildCommand> - <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.rubypeople.rdt.core.rubynature</nature> </natures> </projectDescription> \ No newline at end of file .project @@ -1,4 +1,4 @@ -#Fri Dec 05 13:08:44 EST 2008 +#Thu Mar 19 16:47:02 EDT 2009 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.source=1.5 .settings/org.eclipse.jdt.core.prefs @@ -908,7 +908,8 @@ public final class StaxUtils { } - private static void writeStartElementEvent(XMLEvent event, XMLStreamWriter writer) + @SuppressWarnings("unchecked") + private static void writeStartElementEvent(XMLEvent event, XMLStreamWriter writer) throws XMLStreamException { StartElement start = event.asStartElement(); QName name = start.getName(); @@ -923,9 +924,9 @@ public final class StaxUtils { } else { writer.writeStartElement(localName); } - Iterator it = start.getNamespaces(); + Iterator<XMLEvent> it = start.getNamespaces(); while (it != null && it.hasNext()) { - writeEvent((XMLEvent)it.next(), writer); + writeEvent(it.next(), writer); } it = start.getAttributes(); src/main/java/org/apache/cxf/staxutils/StaxUtils.java @@ -25,7 +25,6 @@ import java.util.Map; import org.ho.yaml.Yaml; import org.jboss.deployers.spi.DeploymentException; -import org.jboss.deployers.spi.deployer.DeploymentStage; import org.jboss.deployers.spi.deployer.DeploymentStages; import org.jboss.deployers.spi.deployer.helpers.AbstractDeployer; import org.jboss.deployers.structure.spi.DeploymentUnit; src/main/java/org/jboss/rails/core/deployers/RailsEnvYamlParsingDeployer.java @@ -27,10 +27,8 @@ import java.util.List; import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.spi.attachments.MutableAttachments; -import org.jboss.deployers.spi.deployer.matchers.JarExtensionProvider; import org.jboss.deployers.spi.structure.ClassPathEntry; import org.jboss.deployers.spi.structure.ContextInfo; -import org.jboss.deployers.spi.structure.ModificationType; import org.jboss.deployers.spi.structure.StructureMetaDataFactory; import org.jboss.deployers.vfs.plugins.structure.AbstractVFSStructureDeployer; import org.jboss.deployers.vfs.spi.structure.StructureContext; src/main/java/org/jboss/rails/core/deployers/RailsStructure.java @@ -38,12 +38,16 @@ import org.jboss.virtual.VirtualFile; import org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter; public class RailsEndpointsParsingDeployer extends AbstractParsingDeployer { - + private static final String ENDPOINTS_DIR = "app/endpoints/"; private static final String SUFFIX = ".wsdl"; + + @SuppressWarnings("unused") private static final SuffixMatchFilter SUFFIX_FILTER = new SuffixMatchFilter(SUFFIX); + @SuppressWarnings("unused") private static final String DEFAULT_TRUST_STORE = "auth/truststore.jks"; + public RailsEndpointsParsingDeployer() { setInput(RailsApplicationMetaData.class); src/main/java/org/jboss/rails/endpoints/deployers/RailsEndpointsParsingDeployer.java @@ -29,11 +29,11 @@ import org.jboss.ruby.runtime.RubyDynamicClassLoader; import org.jboss.ruby.runtime.RuntimeInitializer; import org.jruby.Ruby; import org.jruby.RubyArray; +import org.jruby.javasupport.JavaEmbedUtils; +import org.jruby.runtime.builtin.IRubyObject; public class RailsRuntimeInitializer implements RuntimeInitializer { - private static final Logger log = Logger.getLogger(RailsRuntimeInitializer.class ); - private String railsRoot; private String railsEnv; @@ -43,6 +43,9 @@ public class RailsRuntimeInitializer implements RuntimeInitializer { } public void initialize(RubyDynamicClassLoader cl, Ruby ruby) throws Exception { + Logger logger = Logger.getLogger( railsRoot ); + IRubyObject rubyLogger = JavaEmbedUtils.javaToRuby( ruby, logger ); + ruby.getGlobalVariables().set( "$JBOSS_RAILS_LOGGER", rubyLogger ); ruby.evalScriptlet( createProlog() ); RubyArray rubyLoadPath = (RubyArray) ruby.getGlobalVariables().get( "$LOAD_PATH" ); src/main/java/org/jboss/rails/runtime/deployers/RailsRuntimeInitializer.java @@ -18,6 +18,7 @@ # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # 02110-1301 USA, or see the FSF site: http://www.fsf.org. +require %q(org/jboss/rails/runtime/deployers/as_logger) require %q(vendor/rails/railties/lib/initializer) module Rails @@ -51,6 +52,10 @@ module Rails end $LOAD_PATH.uniq! end + def initialize_logger + logger = ActiveSupport::BufferedLogger.new( JBoss::Rails::ASLogger.new( $JBOSS_RAILS_LOGGER ) ) + silence_warnings { Object.const_set "RAILS_DEFAULT_LOGGER", logger } + end end end src/main/java/org/jboss/rails/runtime/deployers/rails_init.rb @@ -204,7 +204,7 @@ public class RubyEndpoint { serverFactory.setBus(bus); serverFactory.setServiceFactory(serviceFactory); - RubyDataBinding dataBinding = new RubyDataBinding(this.runtimePool, this.name); + RubyDataBinding dataBinding = new RubyDataBinding(this.runtimePool); dataBinding.setRubyTypeSpace(this.typeSpace); serviceFactory.setDataBinding(dataBinding); src/main/java/org/jboss/ruby/enterprise/endpoints/RubyEndpoint.java @@ -27,7 +27,6 @@ import javax.xml.namespace.QName; import org.apache.cxf.interceptor.Fault; import org.jboss.logging.Logger; -import org.jboss.ruby.enterprise.endpoints.cxf.RubyDataBinding; import org.jboss.ruby.enterprise.endpoints.databinding.RubyType; import org.jboss.ruby.enterprise.endpoints.databinding.RubyTypeSpace; import org.jboss.ruby.runtime.RubyRuntimePool; src/main/java/org/jboss/ruby/enterprise/endpoints/RubyEndpointHandler.java @@ -26,13 +26,9 @@ import org.apache.cxf.bus.extension.ExtensionManagerBus; import org.apache.cxf.transport.DestinationFactory; import org.apache.cxf.transport.DestinationFactoryManager; import org.apache.cxf.transport.servlet.ServletTransportFactory; -import org.apache.cxf.wsdl.WSDLManager; -import org.jboss.logging.Logger; public class RubyCXFBus extends ExtensionManagerBus { - private static Logger log = Logger.getLogger( RubyCXFBus.class ); - public RubyCXFBus() { } @@ -43,11 +39,6 @@ public class RubyCXFBus extends ExtensionManagerBus { for ( String transportId : destinationFactory.getTransportIds() ) { dfm.registerDestinationFactory( transportId, destinationFactory ); } - - WSDLManager manager = getExtension(WSDLManager.class); - //Definition def = manager.getDefinition( "" ); - //def.get - } } src/main/java/org/jboss/ruby/enterprise/endpoints/cxf/RubyCXFBus.java @@ -28,24 +28,20 @@ import org.apache.cxf.databinding.AbstractDataBinding; import org.apache.cxf.databinding.DataReader; import org.apache.cxf.databinding.DataWriter; import org.apache.cxf.service.Service; -import org.jboss.logging.Logger; import org.jboss.ruby.enterprise.endpoints.databinding.RubyTypeSpace; import org.jboss.ruby.runtime.RubyRuntimePool; import org.w3c.dom.Node; public class RubyDataBinding extends AbstractDataBinding { - private static final Logger log = Logger.getLogger(RubyDataBinding.class); private static final Class<?>[] SUPPORTED_READER_FORMATS = new Class[] { Node.class }; private static final Class<?>[] SUPPORTED_WRITER_FORMATS = new Class[] { Node.class }; - private String name; private RubyRuntimePool runtimePool; private RubyTypeSpace typeSpace; - public RubyDataBinding(RubyRuntimePool runtimePool, String name) { + public RubyDataBinding(RubyRuntimePool runtimePool) { this.runtimePool = runtimePool; - this.name = name; } public void setRubyTypeSpace(RubyTypeSpace typeSpace) { @@ -58,10 +54,10 @@ public class RubyDataBinding extends AbstractDataBinding { public <T> DataReader<T> createReader(Class<T> type) { if ( type == XMLStreamReader.class ) { - return new RubyDataReader<T>( this.typeSpace, this.runtimePool, name ); + return new RubyDataReader<T>( this.typeSpace, this.runtimePool ); } if ( type == Node.class ) { - return new RubyDataReader<T>( this.typeSpace, this.runtimePool, name ); + return new RubyDataReader<T>( this.typeSpace, this.runtimePool ); } return null; } src/main/java/org/jboss/ruby/enterprise/endpoints/cxf/RubyDataBinding.java @@ -33,7 +33,6 @@ import javax.xml.validation.Schema; import org.apache.cxf.databinding.DataReader; import org.apache.cxf.message.Attachment; import org.apache.cxf.service.model.MessagePartInfo; -import org.jboss.logging.Logger; import org.jboss.ruby.enterprise.endpoints.databinding.RubyType; import org.jboss.ruby.enterprise.endpoints.databinding.RubyTypeSpace; import org.jboss.ruby.enterprise.endpoints.databinding.RubyXMLStreamDataReader; @@ -43,22 +42,22 @@ import org.jruby.runtime.builtin.IRubyObject; public class RubyDataReader<T> implements DataReader<T> { - private static final Logger log = Logger.getLogger(RubyDataReader.class); - + @SuppressWarnings("unused") private Collection<Attachment> attachments; - private Map<String, Object> properties = new HashMap<String, Object>(); + @SuppressWarnings("unused") private Schema schema; + + private Map<String, Object> properties = new HashMap<String, Object>(); + private RubyTypeSpace typeSpace; private RubyRuntimePool runtimePool; - private String name; private RubyXMLStreamDataReader reader; - public RubyDataReader(RubyTypeSpace typeSpace, RubyRuntimePool runtimePool, String name) { + public RubyDataReader(RubyTypeSpace typeSpace, RubyRuntimePool runtimePool) { this.typeSpace = typeSpace; this.runtimePool = runtimePool; - this.name = name; this.reader = new RubyXMLStreamDataReader(); } src/main/java/org/jboss/ruby/enterprise/endpoints/cxf/RubyDataReader.java @@ -41,9 +41,12 @@ public class RubyDataWriter<T> implements DataWriter<T> { private static final Logger log = Logger.getLogger(RubyDataWriter.class); + @SuppressWarnings("unused") private Collection<Attachment> attachments; - private Map<String, Object> properties = new HashMap<String, Object>(); + @SuppressWarnings("unused") private Schema schema; + + private Map<String, Object> properties = new HashMap<String, Object>(); private RubyXMLStreamDataWriter streamWriter; src/main/java/org/jboss/ruby/enterprise/endpoints/cxf/RubyDataWriter.java @@ -33,12 +33,10 @@ import org.apache.cxf.message.MessageContentsList; import org.apache.cxf.service.invoker.Invoker; import org.apache.cxf.service.model.BindingOperationInfo; import org.apache.cxf.service.model.MessagePartInfo; -import org.jboss.logging.Logger; import org.jboss.ruby.enterprise.endpoints.RubyEndpointHandler; public class RubyEndpointInvoker implements Invoker { - private static final Logger log = Logger.getLogger(RubyEndpointInvoker.class); private RubyEndpointHandler handler; public RubyEndpointInvoker(RubyEndpointHandler handler) { src/main/java/org/jboss/ruby/enterprise/endpoints/cxf/RubyEndpointInvoker.java @@ -40,6 +40,7 @@ public class RubyServiceConfiguration extends DefaultServiceConfiguration { return this.portName; } + @SuppressWarnings("unchecked") @Override public Class getRequestWrapper(Method selected) { return StAXSource.class; @@ -50,6 +51,7 @@ public class RubyServiceConfiguration extends DefaultServiceConfiguration { return StAXSource.class.getName(); } + @SuppressWarnings("unchecked") @Override public Class getResponseWrapper(Method selected) { return StAXSource.class; src/main/java/org/jboss/ruby/enterprise/endpoints/cxf/RubyServiceConfiguration.java @@ -26,7 +26,6 @@ import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import org.jboss.logging.Logger; import org.jboss.ruby.enterprise.endpoints.databinding.complex.RubyAttribute; import org.jboss.ruby.enterprise.endpoints.databinding.complex.RubyComplexType; import org.jboss.ruby.enterprise.endpoints.databinding.simple.RubySimpleType; @@ -35,8 +34,6 @@ import org.jruby.javasupport.JavaEmbedUtils; import org.jruby.runtime.builtin.IRubyObject; public class RubyXMLStreamDataReader { - private static final Logger log = Logger.getLogger(RubyXMLStreamDataReader.class); - public RubyXMLStreamDataReader() { } @@ -79,7 +76,7 @@ public class RubyXMLStreamDataReader { } public Object readComplex(Ruby runtime, XMLStreamReader input, RubyComplexType type) throws XMLStreamException { - QName name = input.getName(); + //QName name = input.getName(); readXMLAttributesAndNamespaces(input); src/main/java/org/jboss/ruby/enterprise/endpoints/databinding/RubyXMLStreamDataReader.java @@ -34,14 +34,11 @@ import org.apache.ws.commons.schema.XmlSchemaComplexType; import org.apache.ws.commons.schema.XmlSchemaElement; import org.apache.ws.commons.schema.XmlSchemaGroupBase; import org.apache.ws.commons.schema.XmlSchemaParticle; -import org.jboss.logging.Logger; import org.jboss.ruby.enterprise.endpoints.databinding.RubyType; import org.jboss.ruby.enterprise.endpoints.databinding.RubyTypeSpace; public class RubyComplexType extends RubyType { - private static final Logger log = Logger.getLogger(RubyComplexType.class); - private XmlSchemaComplexType xsdType; private List<RubyAttribute> attributes = new ArrayList<RubyAttribute>(); src/main/java/org/jboss/ruby/enterprise/endpoints/databinding/complex/RubyComplexType.java @@ -21,8 +21,6 @@ */ package org.jboss.ruby.enterprise.jobs; -import java.util.Date; - import org.jboss.logging.Logger; import org.jboss.ruby.runtime.RubyRuntimePool; import org.jboss.ruby.util.StringUtils; src/main/java/org/jboss/ruby/enterprise/jobs/RubyJobHandler.java @@ -21,7 +21,6 @@ */ package org.jboss.ruby.enterprise.jobs.deployers; -import java.util.Properties; import java.util.Set; import org.jboss.beans.metadata.spi.BeanMetaData; @@ -35,9 +34,6 @@ import org.jboss.ruby.enterprise.jobs.RubyJob; import org.jboss.ruby.enterprise.jobs.RubyScheduler; import org.jboss.ruby.enterprise.jobs.metadata.RubyJobMetaData; import org.jboss.ruby.runtime.deployers.RubyRuntimePoolDeployer; -import org.quartz.Scheduler; -import org.quartz.SchedulerException; -import org.quartz.impl.StdSchedulerFactory; public class RubyJobDeployer extends AbstractDeployer { src/main/java/org/jboss/ruby/enterprise/jobs/deployers/RubyJobDeployer.java @@ -21,30 +21,17 @@ */ package org.jboss.ruby.enterprise.sip.deployers; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.spi.deployer.DeploymentStages; import org.jboss.deployers.vfs.spi.deployer.AbstractSimpleVFSRealDeployer; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.deployment.ConvergedSipAnnotationMetaDataDeployer; import org.jboss.logging.Logger; -import org.jboss.metadata.javaee.spec.ParamValueMetaData; import org.jboss.metadata.sip.jboss.JBossConvergedSipMetaData; import org.jboss.metadata.sip.spec.ServletSelectionMetaData; import org.jboss.metadata.sip.spec.Sip11MetaData; -import org.jboss.metadata.web.jboss.JBossServletMetaData; -import org.jboss.metadata.web.jboss.JBossServletsMetaData; import org.jboss.metadata.web.jboss.JBossWebMetaData; -import org.jboss.metadata.web.spec.FilterMappingMetaData; -import org.jboss.metadata.web.spec.FilterMetaData; -import org.jboss.metadata.web.spec.FiltersMetaData; -import org.jboss.metadata.web.spec.ServletMappingMetaData; import org.jboss.ruby.enterprise.sip.metadata.SipApplicationMetaData; -import org.jboss.ruby.enterprise.web.StaticResourceServlet; -import org.jboss.ruby.enterprise.web.rack.RackFilter; /** * @author jean.deruelle@gmail.com src/main/java/org/jboss/ruby/enterprise/sip/deployers/ConvergedSipRackWebApplicationDeployer.java @@ -27,7 +27,6 @@ import org.ho.yaml.Yaml; import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.ruby.enterprise.sip.metadata.SipApplicationMetaData; -import org.jboss.ruby.enterprise.web.rack.metadata.RackWebApplicationMetaData; import org.jboss.virtual.VirtualFile; /** @@ -48,6 +47,7 @@ public class SipYamlParsingDeployer extends /* (non-Javadoc) * @see org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer#parse(org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit, org.jboss.virtual.VirtualFile, java.lang.Object) */ + @SuppressWarnings("unchecked") @Override protected SipApplicationMetaData parse(VFSDeploymentUnit unit, VirtualFile file, SipApplicationMetaData arg2) throws Exception { src/main/java/org/jboss/ruby/enterprise/sip/deployers/SipYamlParsingDeployer.java @@ -21,7 +21,6 @@ */ package org.jboss.ruby.enterprise.sip.metadata; -import org.jboss.logging.Logger; /** * @author jean.deruelle@gmail.com @@ -31,7 +30,7 @@ public class SipApplicationMetaData { private String applicationName; private String mainServlet; - private Logger log = Logger.getLogger(SipApplicationMetaData.class); + //private Logger log = Logger.getLogger(SipApplicationMetaData.class); public void setApplicationName(String applicationName) { this.applicationName = applicationName; src/main/java/org/jboss/ruby/enterprise/sip/metadata/SipApplicationMetaData.java @@ -25,14 +25,11 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import org.apache.catalina.servlets.DefaultServlet; -import org.jboss.logging.Logger; public class StaticResourceServlet extends DefaultServlet { private static final long serialVersionUID = 7173759925797350928L; - private static final Logger log = Logger.getLogger( StaticResourceServlet.class ); - private String resourceRoot; @Override src/main/java/org/jboss/ruby/enterprise/web/StaticResourceServlet.java @@ -24,7 +24,6 @@ package org.jboss.ruby.enterprise.web.rack; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; -import org.jboss.logging.Logger; import org.jruby.Ruby; import org.jruby.RubyArray; import org.jruby.RubyIO; @@ -33,7 +32,6 @@ import org.jruby.javasupport.JavaEmbedUtils; import org.jruby.runtime.builtin.IRubyObject; public class RubyRackApplication implements RackApplication { - private static final Logger log = Logger.getLogger(RubyRackApplication.class); private Ruby ruby; private IRubyObject rubyApp; @@ -52,18 +50,19 @@ public class RubyRackApplication implements RackApplication { Ruby ruby = rubyApp.getRuntime(); RubyIO input = new RubyIO(ruby, request.getInputStream()); - RubyIO errors = new RubyIO(ruby, System.err); + RubyIO errors = new RubyIO(ruby, System.out); ruby.evalScriptlet("require %q(org/jboss/ruby/enterprise/web/rack/environment_builder)"); RubyModule envBuilder = ruby.getClassFromPath("JBoss::Rack::EnvironmentBuilder"); - return JavaEmbedUtils.invokeMethod(ruby, envBuilder, "build", new Object[] { context, request, input, errors }, Object.class); + return JavaEmbedUtils.invokeMethod(ruby, envBuilder, "build", new Object[] { context, request, input, errors }, + Object.class); } public RackResponse call(Object env) { - IRubyObject response = (RubyArray) JavaEmbedUtils - .invokeMethod(this.ruby, this.rubyApp, "call", new Object[] { env }, RubyArray.class); + IRubyObject response = (RubyArray) JavaEmbedUtils.invokeMethod(this.ruby, this.rubyApp, "call", new Object[] { env }, + RubyArray.class); return new RubyRackResponse(response); } src/main/java/org/jboss/ruby/enterprise/web/rack/RubyRackApplication.java @@ -21,14 +21,11 @@ */ package org.jboss.ruby.enterprise.web.rack; -import org.jboss.logging.Logger; import org.jboss.ruby.runtime.RubyRuntimeFactory; import org.jruby.Ruby; public class RubyRackApplicationFactory implements RackApplicationFactory { - private static final Logger log = Logger.getLogger( RubyRackApplicationFactory.class ); - private RubyRuntimeFactory runtimeFactory; private String rackUpScript; src/main/java/org/jboss/ruby/enterprise/web/rack/RubyRackApplicationFactory.java @@ -23,7 +23,6 @@ package org.jboss.ruby.enterprise.web.rack; import javax.servlet.http.HttpServletResponse; -import org.jboss.logging.Logger; import org.jruby.Ruby; import org.jruby.RubyClass; import org.jruby.javasupport.JavaEmbedUtils; @@ -31,7 +30,6 @@ import org.jruby.runtime.builtin.IRubyObject; public class RubyRackResponse implements RackResponse { - private static final Logger log = Logger.getLogger( RubyRackResponse.class ); private IRubyObject rackResponse; public RubyRackResponse(IRubyObject rackResponse) { src/main/java/org/jboss/ruby/enterprise/web/rack/RubyRackResponse.java @@ -42,7 +42,9 @@ module JBoss env_name = name.upcase.gsub( /-/, '_' ) env["HTTP_#{env_name}"] = servlet_request.getHeader( name ) end - env['servlet_request'] = servlet_request + env['servlet_request'] = servlet_request + # and again, for jruby-rack compatibility + env['java.servlet_request'] = servlet_request env end end src/main/java/org/jboss/ruby/enterprise/web/rack/environment_builder.rb @@ -28,7 +28,6 @@ import java.util.List; import java.util.Map; import org.jboss.kernel.Kernel; -import org.jboss.logging.Logger; import org.jruby.Ruby; import org.jruby.RubyClass; import org.jruby.RubyInstanceConfig; @@ -37,13 +36,11 @@ import org.jruby.util.ClassCache; public class DefaultRubyRuntimeFactory implements RubyRuntimeFactory { - private static final Logger log = Logger.getLogger(DefaultRubyRuntimeFactory.class); - private Kernel kernel; private RuntimeInitializer initializer; private RubyDynamicClassLoader classLoader; - private ClassCache classCache; + private ClassCache<?> classCache; public DefaultRubyRuntimeFactory() { this(null); @@ -76,7 +73,7 @@ public class DefaultRubyRuntimeFactory implements RubyRuntimeFactory { config.setLoader(childLoader); if ( this.classCache == null ) { - this.classCache = new ClassCache( this.classLoader ); + this.classCache = new ClassCache<Object>( this.classLoader ); } config.setClassCache( classCache ); src/main/java/org/jboss/ruby/runtime/DefaultRubyRuntimeFactory.java @@ -24,12 +24,8 @@ package org.jboss.ruby.runtime; import java.net.URL; import java.net.URLClassLoader; -import org.jboss.logging.Logger; - public class LoadPathClassLoader extends URLClassLoader { - private static final Logger log = Logger.getLogger(LoadPathClassLoader.class); - private URL[] urls; public LoadPathClassLoader(URL[] urls, ClassLoader parent) { @@ -41,9 +37,10 @@ public class LoadPathClassLoader extends URLClassLoader { public URL findResource(String name) { URL result = super.findResource(name); return result; - } - + public URL[] getURLs() { + return this.urls; + } } src/main/java/org/jboss/ruby/runtime/LoadPathClassLoader.java @@ -30,15 +30,12 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.jboss.logging.Logger; import org.jboss.virtual.MemoryFileFactory; import org.jboss.virtual.VirtualFile; import org.jboss.virtual.plugins.context.memory.MemoryContextFactory; public class RubyDynamicClassLoader extends URLClassLoader { - private static final Logger log = Logger.getLogger(RubyDynamicClassLoader.class); - private static final URL[] EMPTY_URL_ARRAY = new URL[]{}; private URL baseUrl; src/main/java/org/jboss/ruby/runtime/RubyDynamicClassLoader.java @@ -25,7 +25,6 @@ import org.jboss.ruby.runtime.RuntimeInitializer; public class RubyRuntimeMetaData { - private LoadPathMetaData loadPath; private RuntimeInitializer initializer; public RubyRuntimeMetaData() { src/main/java/org/jboss/ruby/runtime/metadata/RubyRuntimeMetaData.java .settings/org.maven.ide.eclipse.prefs 9b5aaa6701b1a89679eb4ef3b3a33e1bce683756 Bob McWhirter bob@fnokd.com http://github.com/bobmcwhirter/jboss-rails/commit/a968e4313e780ff1ffc9535779f47c5d43bba67c a968e4313e780ff1ffc9535779f47c5d43bba67c 2009-03-19T22:01:41-07:00 2009-03-19T22:01:41-07:00 Suppress or fix most all warnings. Wire up rails logging to the AS logging system. 5c84a144c77359a2014b51e290bc26ce32226ebf Bob McWhirter bob@fnokd.com