Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions History.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

- Adds basic compatibility with JRuby 10.0
- Drop unnecessary jruby.compat.version and RackConfig.getCompatVersion() API
- Drop JMS support
- update (bundled) rack to 2.2.16

## 1.2.4 (UNRELEASED)

Expand Down
2 changes: 0 additions & 2 deletions examples/servers/Apache-Tomcat-6-0-14.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ filter_adds_html = true
filter_verifies_resource = false
ignore_environment = true
initial_runtimes =
jms_connection_factory =
jms_jndi_properties =
logger = org.jruby.rack.logging.ServletContextLogger@7a14b43d
logger_class_name = servlet_context
logger_name = jruby.rack
Expand Down
2 changes: 0 additions & 2 deletions examples/servers/Apache-Tomcat-7-0-2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ filter_adds_html = true
filter_verifies_resource = false
ignore_environment = true
initial_runtimes =
jms_connection_factory =
jms_jndi_properties =
logger = org.jruby.rack.logging.ServletContextLogger@398a3257
logger_class_name = servlet_context
logger_name = jruby.rack
Expand Down
2 changes: 0 additions & 2 deletions examples/servers/GlassFish-v3.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ filter_adds_html = true
filter_verifies_resource = false
ignore_environment = true
initial_runtimes =
jms_connection_factory =
jms_jndi_properties =
logger = org.jruby.rack.logging.ServletContextLogger@46ee45a5
logger_class_name = servlet_context
logger_name = jruby.rack
Expand Down
2 changes: 0 additions & 2 deletions examples/servers/JBoss-Web-2-1-3-GA.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ filter_adds_html = true
filter_verifies_resource = false
ignore_environment = true
initial_runtimes =
jms_connection_factory =
jms_jndi_properties =
logger = org.jruby.rack.logging.ServletContextLogger@1a20433b
logger_class_name = servlet_context
logger_name = jruby.rack
Expand Down
2 changes: 0 additions & 2 deletions examples/servers/JBoss-Web-3-0-0-CR1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ filter_adds_html = true
filter_verifies_resource = false
ignore_environment = true
initial_runtimes =
jms_connection_factory =
jms_jndi_properties =
logger = org.jruby.rack.logging.ServletContextLogger@7ee18d93
logger_class_name = servlet_context
logger_name = jruby.rack
Expand Down
2 changes: 0 additions & 2 deletions examples/servers/Resin-4-0-13.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ filter_adds_html = true
filter_verifies_resource = false
ignore_environment = true
initial_runtimes =
jms_connection_factory =
jms_jndi_properties =
logger = org.jruby.rack.logging.ServletContextLogger@6c538793
logger_class_name = servlet_context
logger_name = jruby.rack
Expand Down
2 changes: 0 additions & 2 deletions examples/servers/Winstone-Servlet-Engine-v0-9-10.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ filter_adds_html = true
filter_verifies_resource = false
ignore_environment = true
initial_runtimes =
jms_connection_factory =
jms_jndi_properties =
logger = org.jruby.rack.logging.ServletContextLogger@397af435
logger_class_name = servlet_context
logger_name = jruby.rack
Expand Down
14 changes: 6 additions & 8 deletions examples/servers/jetty-6-1-25.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ filter_adds_html = true
filter_verifies_resource = false
ignore_environment = true
initial_runtimes =
jms_connection_factory =
jms_jndi_properties =
logger = org.jruby.rack.logging.ServletContextLogger@1303368e
logger_class_name = servlet_context
logger_name = jruby.rack
Expand Down Expand Up @@ -149,13 +147,13 @@ SERVER_PORT = 8080
SERVER_SOFTWARE = jetty/6.1.25
java.servlet_context = org.jruby.rack.servlet.DefaultServletRackContext@f0c0ef2
java.servlet_request = GET /sinatra/env HTTP/1.1
User-Agent: curl/7.21.4 (universal-apple-darwin11.0) libcurl/7.21.4 OpenSSL/0.9.8r zlib/1.2.5
Host: localhost:8080
Accept: */*
User-Agent: curl/7.21.4 (universal-apple-darwin11.0) libcurl/7.21.4 OpenSSL/0.9.8r zlib/1.2.5
Host: localhost:8080
Accept: */*

java.servlet_response = HTTP/1.1 200
Date: Thu, 22 Sep 2011 23:10:50 GMT
Date: Thu, 22 Sep 2011 23:10:50 GMT

jruby.rack.dynamic.requests.only = true
jruby.rack.jruby.version = 1.6.4
jruby.rack.rack.release = 1.3
Expand Down
4 changes: 1 addition & 3 deletions examples/servers/jetty-7-1-6-v20100715.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ filter_adds_html = true
filter_verifies_resource = false
ignore_environment = true
initial_runtimes =
jms_connection_factory =
jms_jndi_properties =
logger = org.jruby.rack.logging.ServletContextLogger@773fc437
logger_class_name = servlet_context
logger_name = jruby.rack
Expand Down Expand Up @@ -147,7 +145,7 @@ SERVER_SOFTWARE = jetty/7.1.6.v20100715
java.servlet_context = org.jruby.rack.servlet.DefaultServletRackContext@32645ccb
java.servlet_request = [GET /sinatra/env]@9171491 org.eclipse.jetty.server.Request@8bf223
java.servlet_response = HTTP/1.1 200

jruby.rack.dynamic.requests.only = true
jruby.rack.jruby.version = 1.6.4
jruby.rack.rack.release = 1.3
Expand Down
6 changes: 0 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,6 @@
<version>2.3.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
<version>2.0.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
Expand Down
10 changes: 0 additions & 10 deletions src/main/java/org/jruby/rack/DefaultRackConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -208,16 +208,6 @@ public boolean isFilterVerifiesResource() {
return getBooleanProperty("jruby.rack.filter.verifies.resource", false);
}

@Override
public String getJmsConnectionFactory() {
return getProperty("jms.connection.factory");
}

@Override
public String getJmsJndiProperties() {
return getProperty("jms.jndi.properties");
}

public String getLoggerName() {
return getProperty("jruby.rack.logging.name", "jruby.rack");
}
Expand Down
21 changes: 1 addition & 20 deletions src/main/java/org/jruby/rack/RackConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -168,26 +168,7 @@ public interface RackConfig {
*/
@Deprecated
boolean isFilterVerifiesResource();

/**
* Return the JNDI name of the JMS connection factory.
*
* @return the JMS connection factory
* @deprecated JMS is rarely used thus should not be here
*/
@Deprecated
String getJmsConnectionFactory();

/**
* Return the JNDI properties for JMS.
*
* @return the JNDI properties
* @deprecated JMS is rarely used thus should not be here
*/
@Deprecated
String getJmsJndiProperties();

/**
/**
* General property retrieval for custom configuration values.
*
* @param key the key
Expand Down
10 changes: 0 additions & 10 deletions src/main/java/org/jruby/rack/embed/Config.java
Original file line number Diff line number Diff line change
Expand Up @@ -195,14 +195,4 @@ public boolean isFilterVerifiesResource() {
throw new UnsupportedOperationException("isFilterVerifiesResource()");
}

// JMS configuration not used with embed :

public String getJmsConnectionFactory() {
throw new UnsupportedOperationException("getJmsConnectionFactory()");
}

public String getJmsJndiProperties() {
throw new UnsupportedOperationException("getJmsJndiProperties()");
}

}
148 changes: 0 additions & 148 deletions src/main/java/org/jruby/rack/jms/DefaultQueueManager.java

This file was deleted.

Loading