[Mulgara-svn] r1981 - in trunk: . conf conf/core lib lib/jsp src/jar/content-rdfa/java/org/mulgara/content/rdfa src/jar/descriptor src/jar/server/java/org/mulgara/server src/jar/server-http src/jar/tag src/jar/util/java/org/mulgara/util src/war/web-services/WEB-INF
pag at mulgara.org
pag at mulgara.org
Fri Oct 1 04:17:29 UTC 2010
Author: pag
Date: 2010-10-01 04:17:29 +0000 (Fri, 01 Oct 2010)
New Revision: 1981
Added:
trunk/.svnignore
trunk/lib/jetty-continuation-7.1.6.v20100715.jar
trunk/lib/jetty-deploy-7.1.6.v20100715.jar
trunk/lib/jetty-http-7.1.6.v20100715.jar
trunk/lib/jetty-io-7.1.6.v20100715.jar
trunk/lib/jetty-security-7.1.6.v20100715.jar
trunk/lib/jetty-server-7.1.6.v20100715.jar
trunk/lib/jetty-servlet-7.1.6.v20100715.jar
trunk/lib/jetty-servlets-7.1.6.v20100715.jar
trunk/lib/jetty-util-7.1.6.v20100715.jar
trunk/lib/jetty-webapp-7.1.6.v20100715.jar
trunk/lib/jetty-xml-7.1.6.v20100715.jar
trunk/lib/jsp/
trunk/lib/jsp/com.sun.el_1.0.0.v201004190952.jar
trunk/lib/jsp/ecj-3.6.jar
trunk/lib/jsp/javax.el_2.1.0.v201004190952.jar
trunk/lib/jsp/javax.servlet.jsp.jstl_1.2.0.v201004190952.jar
trunk/lib/jsp/javax.servlet.jsp_2.1.0.v201004190952.jar
trunk/lib/jsp/jetty-jsp-2.1-7.1.6.v20100715.jar
trunk/lib/jsp/org.apache.jasper.glassfish_2.1.0.v201007080150.jar
trunk/lib/jsp/org.apache.taglibs.standard.glassfish_1.2.0.v201004190952.jar
trunk/lib/servlet-api-2.5.jar
trunk/src/jar/util/java/org/mulgara/util/JettyLogger.java
Removed:
trunk/lib/jasper-compiler-4.2.29.jar
trunk/lib/jasper-runtime-4.2.29.jar
trunk/lib/jetty-6.1.11.jar
trunk/lib/jetty-util-6.1.11.jar
trunk/lib/jsp-2.1.jar
trunk/lib/jsp-api-2.1.jar
trunk/lib/servlet-api-2.5-6.1.11.jar
trunk/src/jar/util/java/org/mulgara/util/MortbayLogger.java
Modified:
trunk/
trunk/.classpath
trunk/build.properties
trunk/build.xml
trunk/common.xml
trunk/conf/core/mulgara-x-config.xml
trunk/conf/mulgara-config-x11.xml
trunk/conf/mulgara-config-xa1.xml
trunk/conf/mulgara-config.xml
trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/BasedResolver.java
trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/RdfaContentHandler.java
trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/RdfaStatements.java
trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/StatementParser.java
trunk/src/jar/descriptor/build.xml
trunk/src/jar/server-http/build.xml
trunk/src/jar/server/java/org/mulgara/server/HttpServices.java
trunk/src/jar/tag/build.xml
trunk/src/war/web-services/WEB-INF/web.xml
Log:
Added RDFa content handler.
Due to problems during development of the RDFa content handler, Jetty was upgraded to Jetty 7.
This includes upgrades to all the JSP Jars, including Jasper. Several configuration items had
to be changed with this upgrade, including some package names and use of APIs. Jetty 7 is now
broken down into its component Jars, instead of the couple of Jar files that used to contain
everything. This has led to a much longer classpath in some of the build files, and many more
entries in the lib directory. Since there are 8 JSP Jar files, these were put into their own
directory called lib/jsp.
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
- bin
obj
dist
test
testDatabase
jxtest
sqltest
tmp
+ server1
Modified: trunk/.classpath
===================================================================
--- trunk/.classpath 2010-10-01 04:11:19 UTC (rev 1980)
+++ trunk/.classpath 2010-10-01 04:17:29 UTC (rev 1981)
@@ -88,8 +88,6 @@
<classpathentry kind="lib" path="lib/icu4j_3_4.jar"/>
<classpathentry kind="lib" path="lib/jakarta-oro-2.0.5.jar"/>
<classpathentry kind="lib" path="lib/jargs-0.2.jar"/>
- <classpathentry kind="lib" path="lib/jasper-compiler-4.2.29.jar"/>
- <classpathentry kind="lib" path="lib/jasper-runtime-4.2.29.jar"/>
<classpathentry kind="lib" path="lib/javacc.jar"/>
<classpathentry kind="lib" path="lib/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="lib/je-4.0.103.jar"/>
@@ -97,8 +95,17 @@
<classpathentry kind="lib" path="lib/jenatest-2.5.6.jar"/>
<classpathentry kind="lib" path="lib/interruptiblermi-1.1.jar"/>
<classpathentry kind="lib" path="lib/iri-0.5.jar"/>
- <classpathentry kind="lib" path="lib/jetty-6.1.11.jar"/>
- <classpathentry kind="lib" path="lib/jetty-util-6.1.11.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-continuation-7.1.6.v20100715.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-deploy-7.1.6.v20100715.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-http-7.1.6.v20100715.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-io-7.1.6.v20100715.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-security-7.1.6.v20100715.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-server-7.1.6.v20100715.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-servlet-7.1.6.v20100715.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-servlets-7.1.6.v20100715.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-util-7.1.6.v20100715.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-webapp-7.1.6.v20100715.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-xml-7.1.6.v20100715.jar"/>
<classpathentry kind="lib" path="lib/jid3-0.34.jar"/>
<classpathentry kind="lib" path="lib/jl1.0.jar"/>
<classpathentry kind="lib" path="lib/jline-0.9.94.jar"/>
@@ -106,7 +113,14 @@
<classpathentry kind="lib" path="lib/jotm-2.0.10.jar"/>
<classpathentry kind="lib" path="lib/jotm_jrmp_stubs-2.0.10.jar"/>
<classpathentry kind="lib" path="lib/js-1.5r3.jar"/>
- <classpathentry kind="lib" path="lib/jsp-api-2.1.jar"/>
+ <classpathentry kind="lib" path="lib/jsp/com.sun.el_1.0.0.v201004190952.jar"/>
+ <classpathentry kind="lib" path="lib/jsp/ecj-3.6.jar"/>
+ <classpathentry kind="lib" path="lib/jsp/javax.el_2.1.0.v201004190952.jar"/>
+ <classpathentry kind="lib" path="lib/jsp/javax.servlet.jsp.jstl_1.2.0.v201004190952.jar"/>
+ <classpathentry kind="lib" path="lib/jsp/javax.servlet.jsp_2.1.0.v201004190952.jar"/>
+ <classpathentry kind="lib" path="lib/jsp/jetty-jsp-2.1-7.1.6.v20100715.jar"/>
+ <classpathentry kind="lib" path="lib/jsp/org.apache.jasper.glassfish_2.1.0.v201007080150.jar"/>
+ <classpathentry kind="lib" path="lib/jsp/org.apache.taglibs.standard.glassfish_1.2.0.v201004190952.jar"/>
<classpathentry kind="lib" path="lib/jta-spec1_0_1.jar"/>
<classpathentry kind="lib" path="lib/jtidy-r7-xmlc-2.2.jar"/>
<classpathentry kind="lib" path="lib/junit-3.8.1.jar"/>
@@ -118,7 +132,7 @@
<classpathentry kind="lib" path="lib/Quick4util.jar"/>
<classpathentry kind="lib" path="lib/saaj-1.4.jar"/>
<classpathentry kind="lib" path="lib/sablecc-2.18.2.jar"/>
- <classpathentry kind="lib" path="lib/servlet-api-2.5-6.1.11.jar"/>
+ <classpathentry kind="lib" path="lib/servlet-api-2.5.jar"/>
<classpathentry kind="lib" path="lib/sesame-model-2.2.1.jar"/>
<classpathentry kind="lib" path="lib/trove-2.0.4.jar"/>
<classpathentry kind="lib" path="lib/velocity-1.5.jar"/>
@@ -134,7 +148,7 @@
<classpathentry kind="lib" path="lib/httpclient-4.0-beta2.jar"/>
<classpathentry kind="lib" path="lib/httpcore-4.0-beta3.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.0-beta2.jar"/>
- <classpathentry kind="lib" path="lib/htmlparser-1.2.1.jar"/>
- <classpathentry kind="lib" path="lib/java-rdfa-0.4.1.jar"/>
+ <classpathentry kind="lib" path="lib/htmlparser-1.2.1.jar"/>
+ <classpathentry kind="lib" path="lib/java-rdfa-0.4.1.jar"/>
<classpathentry kind="output" path="obj/jar"/>
</classpath>
Added: trunk/.svnignore
===================================================================
--- trunk/.svnignore (rev 0)
+++ trunk/.svnignore 2010-10-01 04:17:29 UTC (rev 1981)
@@ -0,0 +1 @@
+server1
Modified: trunk/build.properties
===================================================================
--- trunk/build.properties 2010-10-01 04:11:19 UTC (rev 1980)
+++ trunk/build.properties 2010-10-01 04:17:29 UTC (rev 1981)
@@ -119,8 +119,6 @@
interruptiblermi.jar =interruptiblermi-1.1.jar
jakarta-oro.jar =jakarta-oro-2.0.5.jar
jargs.jar =jargs-0.2.jar
-jasper.compiler.jar =jasper-compiler-4.2.29.jar
-jasper.runtime.jar =jasper-runtime-4.2.29.jar
java-rdfa.jar =java-rdfa-0.4.1.jar
jaxrpc.jar =jaxrpc-1.4.jar
jca.jar =connector-1_5.jar
@@ -128,8 +126,17 @@
jenatest.jar =jenatest-2.5.6.jar
jline.jar =jline-0.9.94.jar
iri.jar =iri-0.5.jar
-jetty.jar =jetty-6.1.11.jar
-jetty.plus.jar =jetty-util-6.1.11.jar
+jetty-continuation.jar =jetty-continuation-7.1.6.v20100715.jar
+jetty-deploy.jar =jetty-deploy-7.1.6.v20100715.jar
+jetty-http.jar =jetty-http-7.1.6.v20100715.jar
+jetty-io.jar =jetty-io-7.1.6.v20100715.jar
+jetty-security.jar =jetty-security-7.1.6.v20100715.jar
+jetty-server.jar =jetty-server-7.1.6.v20100715.jar
+jetty-servlet.jar =jetty-servlet-7.1.6.v20100715.jar
+jetty-servlets.jar =jetty-servlets-7.1.6.v20100715.jar
+jetty-util.jar =jetty-util-7.1.6.v20100715.jar
+jetty-webapp.jar =jetty-webapp-7.1.6.v20100715.jar
+jetty-xml.jar =jetty-xml-7.1.6.v20100715.jar
jid3.jar =jid3-0.34.jar
jmdns.jar =jmdns-0.2.jar
joda-time.jar =joda-time-1.5.2.jar
@@ -145,7 +152,7 @@
mail.jar =mail-1.3.jar
saaj.jar =saaj-1.4.jar
serializer.jar =serializer-2.7.0.jar
-servlet.jar =servlet-api-2.5-6.1.11.jar
+servlet.jar =servlet-api-2.5.jar
simple-jndi.jar =simple-jndi-0.9.jar
swoop.jar =swoop-modified-${tks-version}.jar
trove.jar =trove-2.0.4.jar
@@ -158,7 +165,13 @@
velocity.jar =velocity-1.5.jar
xalan.jar =xalan-2.7.0.jar
-# The following are JSP libs to be removed when JSP is excised
jsp-core.jar =core-3.1.1.jar
-jsp.jar =jsp-2.1.jar
-servlet-jsp.jar =jsp-api-2.1.jar
+jsp-el.jar =jsp/com.sun.el_1.0.0.v201004190952.jar
+jsp-ecj.jar =jsp/ecj-3.6.jar
+jsp-javax-el.jar =jsp/javax.el_2.1.0.v201004190952.jar
+jsp-javax-jstl.jar =jsp/javax.servlet.jsp.jstl_1.2.0.v201004190952.jar
+jsp-javax-jsp.jar =jsp/javax.servlet.jsp_2.1.0.v201004190952.jar
+jsp-jetty.jar =jsp/jetty-jsp-2.1-7.1.6.v20100715.jar
+jsp-glassfish.jar =jsp/org.apache.jasper.glassfish_2.1.0.v201007080150.jar
+jsp-glassfish-taglibs.jar=jsp/org.apache.taglibs.standard.glassfish_1.2.0.v201004190952.jar
+
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2010-10-01 04:11:19 UTC (rev 1980)
+++ trunk/build.xml 2010-10-01 04:17:29 UTC (rev 1981)
@@ -517,15 +517,22 @@
<zipfileset src="${lib.dir}/${icu4j.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jakarta-oro.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jargs.jar}" excludes="META-INF/**"/>
- <zipfileset src="${lib.dir}/${jasper.compiler.jar}" excludes="META-INF/**"/>
- <zipfileset src="${lib.dir}/${jasper.runtime.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jaxrpc.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jca.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jena.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${iri.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${interruptiblermi.jar}" excludes="META-INF/**"/>
- <zipfileset src="${lib.dir}/${jetty.jar}" excludes="META-INF/**"/>
- <zipfileset src="${lib.dir}/${jetty.plus.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-continuation.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-deploy.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-http.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-io.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-security.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-server.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-servlet.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-servlets.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-util.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-webapp.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-xml.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jid3.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${joda-time.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jotm.jar}" excludes="META-INF/**"/>
@@ -536,7 +543,6 @@
<zipfileset src="${lib.dir}/${mail.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${saaj.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${servlet.jar}" excludes="META-INF/**, **/*.xml"/>
- <zipfileset src="${lib.dir}/${servlet-jsp.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${sesame-model.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${trove.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${wsdl4j.jar}" excludes="META-INF/**"/>
@@ -832,7 +838,6 @@
<classpath path="${lib.dir}/antlr.jar"/>
<classpath path="${lib.dir}/barracuda-1.2.6.jar"/>
<classpath path="${lib.dir}/${servlet.jar}"/>
- <classpath path="${lib.dir}/${servlet-jsp.jar}"/>
<classpath path="${lib.dir}/${jid3.jar}"/>
<classpath path="${lib.dir}/${lucene.core.jar}"/>
<classpath path="${lib.dir}/xmlc-all-runtime-2.2.jar"/>
@@ -1697,15 +1702,22 @@
<zipfileset src="${lib.dir}/${icu4j.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jakarta-oro.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jargs.jar}" excludes="META-INF/**"/>
- <zipfileset src="${lib.dir}/${jasper.runtime.jar}" excludes="META-INF/**"/>
- <zipfileset src="${lib.dir}/${jasper.compiler.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jaxrpc.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jca.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jena.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${interruptiblermi.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${iri.jar}" excludes="META-INF/**"/>
- <zipfileset src="${lib.dir}/${jetty.jar}" excludes="META-INF/**"/>
- <zipfileset src="${lib.dir}/${jetty.plus.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-continuation.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-deploy.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-http.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-io.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-security.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-server.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-servlet.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-servlets.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-util.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-webapp.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-xml.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jid3.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${joda-time.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jotm.jar}" excludes="META-INF/**"/>
@@ -1724,8 +1736,14 @@
<!-- Libs needed for JSP. Remove these when JSP is eliminated. -->
<zipfileset src="${jsp-lib.dir}/${jsp-core.jar}" excludes="META-INF/**"/>
- <zipfileset src="${jsp-lib.dir}/${jsp.jar}" excludes="META-INF/**"/>
- <zipfileset src="${lib.dir}/${servlet-jsp.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${jsp-lib.dir}/${jsp-el.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${jsp-lib.dir}/${jsp-ecj.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${jsp-lib.dir}/${jsp-javax-el.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${jsp-lib.dir}/${jsp-javax-jstl.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${jsp-lib.dir}/${jsp-javax-jsp.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${jsp-lib.dir}/${jsp-jetty.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${jsp-lib.dir}/${jsp-glassfish.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${jsp-lib.dir}/${jsp-glassfish-taglibs.jar}" excludes="META-INF/**"/>
<!-- core libraries -->
<zipfileset src="${bin.dir}/${query.jar}" excludes="META-INF/**"/>
@@ -2152,15 +2170,22 @@
<zipfileset src="${lib.dir}/${icu4j.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jakarta-oro.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jargs.jar}" excludes="META-INF/**"/>
- <zipfileset src="${lib.dir}/${jasper.runtime.jar}" excludes="META-INF/**"/>
- <zipfileset src="${lib.dir}/${jasper.compiler.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jaxrpc.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jca.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jena.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${interruptiblermi.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${iri.jar}" excludes="META-INF/**"/>
- <zipfileset src="${lib.dir}/${jetty.jar}" excludes="META-INF/**"/>
- <zipfileset src="${lib.dir}/${jetty.plus.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-continuation.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-deploy.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-http.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-io.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-security.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-server.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-servlet.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-servlets.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-util.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-webapp.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${jetty-xml.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jid3.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${joda-time.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jotm.jar}" excludes="META-INF/**"/>
Modified: trunk/common.xml
===================================================================
--- trunk/common.xml 2010-10-01 04:11:19 UTC (rev 1980)
+++ trunk/common.xml 2010-10-01 04:17:29 UTC (rev 1981)
@@ -81,11 +81,28 @@
<pathelement location="${java.home}/lib/tools.jar"/>
<pathelement location="${lib.dir}/ant-1.7.0.jar"/>
- <pathelement location="${lib.dir}/${jasper.runtime.jar}"/>
- <pathelement location="${lib.dir}/${jasper.compiler.jar}"/>
<pathelement location="${lib.dir}/${servlet.jar}"/>
<pathelement location="${lib.dir}/${servlet-jsp.jar}"/>
- <pathelement location="${lib.dir}/${jetty.jar}"/>
+ <pathelement location="${lib.dir}/${jetty-logging.jar}"/>
+ <pathelement location="${lib.dir}/${jetty-continuation.jar}"/>
+ <pathelement location="${lib.dir}/${jetty-deploy.jar}"/>
+ <pathelement location="${lib.dir}/${jetty-http.jar}"/>
+ <pathelement location="${lib.dir}/${jetty-io.jar}"/>
+ <pathelement location="${lib.dir}/${jetty-security.jar}"/>
+ <pathelement location="${lib.dir}/${jetty-server.jar}"/>
+ <pathelement location="${lib.dir}/${jetty-servlet.jar}"/>
+ <pathelement location="${lib.dir}/${jetty-servlets.jar}"/>
+ <pathelement location="${lib.dir}/${jetty-util.jar}"/>
+ <pathelement location="${lib.dir}/${jetty-webapp.jar}"/>
+ <pathelement location="${lib.dir}/${jetty-xml.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-el.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-ecj.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-javax-el.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-javax-jstl.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-javax-jsp.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-jetty.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-glassfish.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-glassfish-taglibs.jar}"/>
</classpath>
<arg value="-d"/>
Modified: trunk/conf/core/mulgara-x-config.xml
===================================================================
--- trunk/conf/core/mulgara-x-config.xml 2010-10-01 04:11:19 UTC (rev 1980)
+++ trunk/conf/core/mulgara-x-config.xml 2010-10-01 04:17:29 UTC (rev 1981)
@@ -108,6 +108,8 @@
<ContentHandler type="org.mulgara.content.mp3.MP3ContentHandler"/>
<ContentHandler type="org.mulgara.content.mbox.MBoxContentHandler"/>
<ContentHandler type="org.mulgara.content.n3.N3ContentHandler"/>
+ <ContentHandler type="org.mulgara.content.rlog.RlogContentHandler"/>
+ <ContentHandler type="org.mulgara.content.rdfa.RdfaContentHandler"/>
<!--
Additional resolvers
Modified: trunk/conf/mulgara-config-x11.xml
===================================================================
--- trunk/conf/mulgara-config-x11.xml 2010-10-01 04:11:19 UTC (rev 1980)
+++ trunk/conf/mulgara-config-x11.xml 2010-10-01 04:17:29 UTC (rev 1981)
@@ -111,6 +111,8 @@
<ContentHandler type="org.mulgara.content.mp3.MP3ContentHandler"/>
<ContentHandler type="org.mulgara.content.mbox.MBoxContentHandler"/>
<ContentHandler type="org.mulgara.content.n3.N3ContentHandler"/>
+ <ContentHandler type="org.mulgara.content.rlog.RlogContentHandler"/>
+ <ContentHandler type="org.mulgara.content.rdfa.RdfaContentHandler"/>
<!--
Additional resolvers
Modified: trunk/conf/mulgara-config-xa1.xml
===================================================================
--- trunk/conf/mulgara-config-xa1.xml 2010-10-01 04:11:19 UTC (rev 1980)
+++ trunk/conf/mulgara-config-xa1.xml 2010-10-01 04:17:29 UTC (rev 1981)
@@ -122,6 +122,7 @@
<ContentHandler type="org.mulgara.content.mbox.MBoxContentHandler"/>
<ContentHandler type="org.mulgara.content.n3.N3ContentHandler"/>
<ContentHandler type="org.mulgara.content.rlog.RlogContentHandler"/>
+ <ContentHandler type="org.mulgara.content.rdfa.RdfaContentHandler"/>
<!--
Additional resolvers
Modified: trunk/conf/mulgara-config.xml
===================================================================
--- trunk/conf/mulgara-config.xml 2010-10-01 04:11:19 UTC (rev 1980)
+++ trunk/conf/mulgara-config.xml 2010-10-01 04:17:29 UTC (rev 1981)
@@ -126,6 +126,7 @@
<ContentHandler type="org.mulgara.content.mbox.MBoxContentHandler"/>
<ContentHandler type="org.mulgara.content.n3.N3ContentHandler"/>
<ContentHandler type="org.mulgara.content.rlog.RlogContentHandler"/>
+ <ContentHandler type="org.mulgara.content.rdfa.RdfaContentHandler"/>
<!--
Additional resolvers
Deleted: trunk/lib/jasper-compiler-4.2.29.jar
===================================================================
(Binary files differ)
Deleted: trunk/lib/jasper-runtime-4.2.29.jar
===================================================================
(Binary files differ)
Deleted: trunk/lib/jetty-6.1.11.jar
===================================================================
(Binary files differ)
Added: trunk/lib/jetty-continuation-7.1.6.v20100715.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/jetty-continuation-7.1.6.v20100715.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/lib/jetty-deploy-7.1.6.v20100715.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/jetty-deploy-7.1.6.v20100715.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/lib/jetty-http-7.1.6.v20100715.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/jetty-http-7.1.6.v20100715.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/lib/jetty-io-7.1.6.v20100715.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/jetty-io-7.1.6.v20100715.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/lib/jetty-security-7.1.6.v20100715.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/jetty-security-7.1.6.v20100715.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/lib/jetty-server-7.1.6.v20100715.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/jetty-server-7.1.6.v20100715.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/lib/jetty-servlet-7.1.6.v20100715.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/jetty-servlet-7.1.6.v20100715.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/lib/jetty-servlets-7.1.6.v20100715.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/jetty-servlets-7.1.6.v20100715.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/lib/jetty-util-6.1.11.jar
===================================================================
(Binary files differ)
Added: trunk/lib/jetty-util-7.1.6.v20100715.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/jetty-util-7.1.6.v20100715.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/lib/jetty-webapp-7.1.6.v20100715.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/jetty-webapp-7.1.6.v20100715.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/lib/jetty-xml-7.1.6.v20100715.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/jetty-xml-7.1.6.v20100715.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/lib/jsp/com.sun.el_1.0.0.v201004190952.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/jsp/com.sun.el_1.0.0.v201004190952.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/lib/jsp/ecj-3.6.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/jsp/ecj-3.6.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/lib/jsp/javax.el_2.1.0.v201004190952.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/jsp/javax.el_2.1.0.v201004190952.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/lib/jsp/javax.servlet.jsp.jstl_1.2.0.v201004190952.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/jsp/javax.servlet.jsp.jstl_1.2.0.v201004190952.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/lib/jsp/javax.servlet.jsp_2.1.0.v201004190952.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/jsp/javax.servlet.jsp_2.1.0.v201004190952.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/lib/jsp/jetty-jsp-2.1-7.1.6.v20100715.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/jsp/jetty-jsp-2.1-7.1.6.v20100715.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/lib/jsp/org.apache.jasper.glassfish_2.1.0.v201007080150.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/jsp/org.apache.jasper.glassfish_2.1.0.v201007080150.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/lib/jsp/org.apache.taglibs.standard.glassfish_1.2.0.v201004190952.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/jsp/org.apache.taglibs.standard.glassfish_1.2.0.v201004190952.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/lib/jsp-2.1.jar
===================================================================
(Binary files differ)
Deleted: trunk/lib/jsp-api-2.1.jar
===================================================================
(Binary files differ)
Deleted: trunk/lib/servlet-api-2.5-6.1.11.jar
===================================================================
(Binary files differ)
Added: trunk/lib/servlet-api-2.5.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/servlet-api-2.5.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/BasedResolver.java
===================================================================
--- trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/BasedResolver.java 2010-10-01 04:11:19 UTC (rev 1980)
+++ trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/BasedResolver.java 2010-10-01 04:17:29 UTC (rev 1981)
@@ -34,6 +34,9 @@
@SuppressWarnings("unused")
private static final Logger logger = Logger.getLogger(BasedResolver.class.getName());
+ /** The file: scheme which we have to work around. */
+ private static final String FILE_SCHEME = "file:";
+
/** The factory for creating new IRIs. */
private final IRIFactory iriFactory;
@@ -67,6 +70,8 @@
*/
public void setBase(String baseStr) {
if (baseStr != null) {
+ // this is a hack to avoid a problem with IRIs
+ if (baseStr.startsWith(FILE_SCHEME)) baseStr = baseStr.replaceFirst("file:", "http://localhost");
this.baseStr = baseStr;
base = iriFactory.construct(baseStr);
}
Modified: trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/RdfaContentHandler.java
===================================================================
--- trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/RdfaContentHandler.java 2010-10-01 04:11:19 UTC (rev 1980)
+++ trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/RdfaContentHandler.java 2010-10-01 04:17:29 UTC (rev 1981)
@@ -50,9 +50,15 @@
/** The MIME type for HTML documents */
static final MimeType HTML_MIME;
+ /** The filename extension for XHTML documents */
+ static final String XHTML_EXT = ".xhtml";
+
+ /** The filename extension for HTML documents */
+ static final String HTML_EXT = ".html";
+
static {
try {
- XHTML_MIME = new MimeType("application", "xml");
+ XHTML_MIME = new MimeType("application", "xhtml+xml");
HTML_MIME = new MimeType("text", "html");
} catch (MimeTypeParseException e) {
throw new Error("Mime initialization error");
@@ -83,7 +89,7 @@
// Obtain the path part of the URI
String path = content.getURI().getPath();
if (path == null) return false;
- return path.endsWith(".html");
+ return path.endsWith(".html") || path.endsWith(".xhtml");
}
/**
Modified: trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/RdfaStatements.java
===================================================================
--- trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/RdfaStatements.java 2010-10-01 04:11:19 UTC (rev 1980)
+++ trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/RdfaStatements.java 2010-10-01 04:17:29 UTC (rev 1981)
@@ -175,12 +175,10 @@
source.terminate();
throw ex;
}
+ assert currentRow != null;
- if (currentRow == null) {
- rowCount = source.getStatementCount();
- source.terminate();
- }
- return currentRow != null;
+ if (currentRow == StatementParser.TERMINATOR) rowCount = source.getStatementCount();
+ return currentRow != StatementParser.TERMINATOR;
}
/**
Modified: trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/StatementParser.java
===================================================================
--- trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/StatementParser.java 2010-10-01 04:11:19 UTC (rev 1980)
+++ trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/StatementParser.java 2010-10-01 04:17:29 UTC (rev 1981)
@@ -21,7 +21,8 @@
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
-import java.util.LinkedList;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
import java.util.Map;
import javax.activation.MimeType;
@@ -73,11 +74,14 @@
/** The prefix that rdfa-java uses */
private static final String RJ_PREFIX = "_:node";
+ /** The period of time to wait in ms for the parser to provide some data. */
+ private static final int TIMEOUT = 30000;
+
/**
* Maximum size for the {@link #triples} buffer. Any larger and the parser will
* block and drain.
*/
- private static final long BUFFER_SIZE = 1000;
+ private static final int BUFFER_SIZE = 1000;
/** Mapping between parsed blank node IDs and local node numbers. */
private IntFile blankNodeIdMap;
@@ -104,17 +108,23 @@
private BasedResolver parseResolver;
/** The queue of triples generated by the parser. */
- private LinkedList<Triple> triples = new LinkedList<Triple>();
+ private LinkedBlockingQueue<Triple> triples = new LinkedBlockingQueue<Triple>(BUFFER_SIZE);
+ /** A marker to indicate that the end of the data has been reached. */
+ static final Triple TERMINATOR = new TripleImpl(null, null, null);
+
/** The number of parsed statements */
private long statementCount = 0;
/** Indicates that parsing is complete */
- private boolean finished = false;
+ private volatile boolean finished = false;
/** Used to asynchronously indicate an exception. */
private Throwable exception = null;
+ /** Thread used for parsing. This is the producer thread. */
+ private Thread parserThread;
+
/**
* Sets up the sink to start receiving triples.
* @param content Contains the data for parsing and its metadata.
@@ -140,33 +150,15 @@
/**
* @return the number of statements parsed so far
*/
- synchronized long getStatementCount() {
+ long getStatementCount() {
return statementCount;
}
/**
- * @return the total number of statements in the file
+ * Do the parsing. This is the entry point of the parsing thread.
*/
- synchronized long waitForStatementTotal() throws TuplesException {
- while (!finished) {
- checkForException();
-
- // ignoring all incoming data
- triples.clear();
- blankNodeInstMap.clear();
- notifyAll();
-
- try {
- wait();
- } catch (InterruptedException ex) {
- throw new TuplesException("Abort");
- }
- }
- checkForException();
- return statementCount;
- }
-
public void run() {
+ parserThread = Thread.currentThread();
Throwable t = null;
try {
@@ -174,14 +166,17 @@
if (logger.isDebugEnabled()) logger.debug("Parsed RDFa on " + content.getURI());
return;
} catch (Throwable th) {
- th.printStackTrace();
+ logger.error("Error parsing RDFa", th);
t = th;
} finally {
- synchronized (this) {
- if (t != null) exception = t;
- finished = true;
- notifyAll();
+ try {
+ triples.put(TERMINATOR);
+ } catch (InterruptedException e) {
+ logger.error("Error ending RDFa parse", e);
+ t = e;
}
+ if (t != null) exception = t;
+ finished = true;
}
if (logger.isDebugEnabled()) logger.debug("Exception while parsing RDFa", exception);
@@ -194,9 +189,6 @@
public void end() {
if (logger.isDebugEnabled()) logger.debug("End RDFa document");
finished = true;
- synchronized (this) {
- notifyAll();
- }
}
public void addPrefix(String prefix, String uri) {
@@ -256,21 +248,12 @@
logger.debug("Parsed " + subjectNode + " " + predicateNode + " " + objectNode + " from " + content.getURI());
}
- synchronized (this) {
- // Wait for the triples buffer to drain if it's too full
- while (triples.size() >= BUFFER_SIZE) {
- try {
- wait();
- } catch (InterruptedException ex) {
- throw new RuntimeException("Abort");
- }
- }
-
- // Buffer the statement
- triples.addLast(new TripleImpl(subjectNode, predicateNode, objectNode));
- statementCount++;
- notifyAll();
+ try {
+ triples.put(new TripleImpl(subjectNode, predicateNode, objectNode));
+ } catch (InterruptedException e) {
+ throw new RuntimeException("Unable to record parsed triple", e);
}
+ statementCount++;
}
/**
@@ -374,29 +357,22 @@
* Returns a new triple from the queue or null if there are no more triples.
* @return The oldest triple in the queue.
*/
- synchronized Triple getTriple() throws TuplesException {
- while (triples.isEmpty()) {
- checkForException();
- if (finished) return null;
-
- // Wait for more triples.
- try {
- wait();
- } catch (InterruptedException ex) {
- throw new TuplesException("Abort");
- }
- }
+ Triple getTriple() throws TuplesException {
checkForException();
allocateBlankNodes();
-
- notifyAll();
- return triples.removeFirst();
+ try {
+ Triple result = triples.poll(TIMEOUT, TimeUnit.MILLISECONDS);
+ if (result == null) throw new TuplesException("Timeout waiting for data from parser");
+ return result;
+ } catch (InterruptedException e) {
+ throw new TuplesException("Unable to retrieve data from the parser", e);
+ }
}
/**
* Allocate the ids for the new blank nodes.
*/
- private synchronized void allocateBlankNodes() {
+ private void allocateBlankNodes() {
try {
for (Map.Entry<Long, BlankNodeImpl> entry : blankNodeInstMap.entrySet()) {
resolverSession.localize(entry.getValue()); // This sets and returns the node ID
@@ -412,17 +388,22 @@
/**
* Stops the thread.
*/
- synchronized void terminate() {
- Thread.currentThread().interrupt();
+ void terminate() {
+ finished = true;
+ if (parserThread != null && parserThread.isAlive()) parserThread.interrupt();
triples.clear();
- notifyAll();
+ try {
+ triples.put(TERMINATOR);
+ } catch (InterruptedException e) {
+ exception = e;
+ }
}
/**
* Tests if the parse is complete.
* @return <code>true</code> if parsing is over.
*/
- synchronized boolean isFinished() {
+ boolean isFinished() {
return finished;
}
@@ -434,8 +415,15 @@
*/
private Format getType(Content c) throws NotModifiedException {
MimeType t = c.getContentType();
- if (RdfaContentHandler.XHTML_MIME.match(t)) return Format.XHTML;
- if (RdfaContentHandler.HTML_MIME.match(t)) return Format.HTML;
+ if (t != null) {
+ if (RdfaContentHandler.XHTML_MIME.match(t)) return Format.XHTML;
+ if (RdfaContentHandler.HTML_MIME.match(t)) return Format.HTML;
+ }
+ String loc = c.getURIString();
+ if (loc != null) {
+ if (loc.endsWith(RdfaContentHandler.XHTML_EXT)) return Format.XHTML;
+ if (loc.endsWith(RdfaContentHandler.HTML_EXT)) return Format.HTML;
+ }
logger.warn("Guessing HTML for unknown MIME type: " + t);
return Format.HTML;
}
Modified: trunk/src/jar/descriptor/build.xml
===================================================================
--- trunk/src/jar/descriptor/build.xml 2010-10-01 04:11:19 UTC (rev 1980)
+++ trunk/src/jar/descriptor/build.xml 2010-10-01 04:17:29 UTC (rev 1981)
@@ -38,9 +38,16 @@
<path refid="common-classpath"/>
- <pathelement location="${lib.dir}/${jasper.runtime.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-core.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-el.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-ecj.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-javax-el.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-javax-jstl.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-javax-jsp.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-jetty.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-glassfish.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-glassfish-taglibs.jar}"/>
<pathelement location="${lib.dir}/${servlet.jar}"/>
- <pathelement location="${lib.dir}/${servlet-jsp.jar}"/>
<pathelement location="${lib.dir}/${jetty.jar}"/>
<pathelement location="${dist.dir}/${driver.jar}"/>
Modified: trunk/src/jar/server/java/org/mulgara/server/HttpServices.java
===================================================================
--- trunk/src/jar/server/java/org/mulgara/server/HttpServices.java 2010-10-01 04:11:19 UTC (rev 1980)
+++ trunk/src/jar/server/java/org/mulgara/server/HttpServices.java 2010-10-01 04:17:29 UTC (rev 1981)
@@ -12,7 +12,7 @@
package org.mulgara.server;
-import static org.mortbay.jetty.servlet.Context.SESSIONS;
+import static org.eclipse.jetty.servlet.ServletContextHandler.SESSIONS;
import java.io.File;
import java.io.FileOutputStream;
@@ -32,19 +32,21 @@
import javax.servlet.Servlet;
import org.apache.log4j.Logger;
-import org.mortbay.jetty.AbstractConnector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.handler.ContextHandler;
-import org.mortbay.jetty.nio.BlockingChannelConnector;
-import org.mortbay.jetty.servlet.ServletHolder;
-import org.mortbay.jetty.webapp.WebAppClassLoader;
-import org.mortbay.jetty.webapp.WebAppContext;
-import org.mortbay.thread.QueuedThreadPool;
-import org.mortbay.util.MultiException;
+import org.eclipse.jetty.server.AbstractConnector;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.HandlerContainer;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.server.handler.HandlerCollection;
+import org.eclipse.jetty.server.nio.BlockingChannelConnector;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.webapp.WebAppClassLoader;
+import org.eclipse.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.util.thread.QueuedThreadPool;
+import org.eclipse.jetty.util.MultiException;
import org.mulgara.config.JettyConnector;
import org.mulgara.config.MulgaraConfig;
-import org.mulgara.util.MortbayLogger;
+import org.mulgara.util.JettyLogger;
import org.mulgara.util.Reflect;
import org.mulgara.util.TempDir;
import org.mulgara.util.functional.Fn1E;
@@ -183,8 +185,8 @@
if (logger.isDebugEnabled()) logger.debug("Creating HTTP server instance");
// Set the magic logging property for Jetty to use Log4j
- System.setProperty(MortbayLogger.LOGGING_CLASS_PROPERTY, MortbayLogger.class.getCanonicalName());
- MortbayLogger.setEnabled(true);
+ System.setProperty(JettyLogger.LOGGING_CLASS_PROPERTY, JettyLogger.class.getCanonicalName());
+ JettyLogger.setEnabled(true);
// create and register a new HTTP server
Server privateServer = buildAndConfigure(config.getJetty().getConnector(), ServerInfo.getHttpPort());
@@ -340,6 +342,7 @@
* @param port The port to listen on. The configuration may have been overriden by this value.
* @throws UnknownHostException if an invalid hostname was specified in the Mulgara server configuration
*/
+ @SuppressWarnings("deprecation")
private void addConnector(Server httpServer, JettyConnector jettyConfig, int port) throws UnknownHostException {
if (httpServer == null) throw new IllegalArgumentException("Null \"httpServer\" parameter");
@@ -386,7 +389,8 @@
/**
- * Creates the Mulgara Descriptor UI
+ * Creates the Mulgara Descriptor UI. Once created, a description of the created services is returned.
+ * @return A Service description of the Descriptor services that were started.
* @throws IOException if the driver WAR file is not readable
*/
private Service addWebServicesWebAppContext(Server server) throws IOException {
@@ -402,7 +406,7 @@
// Add Descriptors and Axis
String webPath = "/" + WEBSERVICES_PATH;
- WebAppContext descriptorWARContext = new WebAppContext(server, warPath, webPath);
+ WebAppContext descriptorWARContext = new WebAppContext(getHandlerCollection(server), warPath, webPath);
// make some attributes available
descriptorWARContext.setAttribute(BOUND_HOST_NAME_KEY, ServerInfo.getBoundHostname());
@@ -415,7 +419,12 @@
/**
- * Creates and registers a web servlet.
+ * Creates and registers a web servlet. The servlet will need to know the server name.
+ * @param server The server to connect the servlet to.
+ * @param name The human-readable name of the servlet to create.
+ * @param servletClass The name of the class that will perform the servlet functions.
+ * @param servletPath The path on the server for the servlet to be loaded onto.
+ * @return A description of the servlet that was set up.
* @throws IOException if the servlet cannot talk to the network.
*/
private Service addWebQueryContext(Server server, String name, String servletClass, String servletPath) throws IOException {
@@ -426,7 +435,7 @@
String rmiName = hostServer.getServerName();
Servlet servlet = (Servlet)Reflect.newInstance(Class.forName(servletClass), hostName, rmiName, hostServer);
String webPath = "/" + servletPath;
- new org.mortbay.jetty.servlet.Context(server, webPath, SESSIONS).addServlet(new ServletHolder(servlet), "/*");
+ new org.eclipse.jetty.servlet.ServletContextHandler(getHandlerCollection(server), webPath, SESSIONS).addServlet(new ServletHolder(servlet), "/*");
return new Service(name, webPath);
} catch (ClassNotFoundException e) {
throw new IllegalStateException("Not configured to use the requested servlet: " + name + "(" + servletClass + ")");
@@ -435,12 +444,13 @@
/**
- * Creates a servlet that requires a Server as a constructor parameter.
- * @param server The server needed by the servlet.
+ * Creates a servlet that requires a Server as a constructor parameter. This is similar to {@link #addWebQueryContext(Server, String, String, String)}
+ * except that the servlet does not need to know the server name.
+ * @param server The server to connect the servlet to.
* @param servletClass The name of the servlet class.
* @param path A relative HTTP path for attaching the servlet.
* @param description A description for the servlet.
- * @return The Service running the new servlet.
+ * @return The Service describing the new servlet.
* @throws IOException Due to problems with the file system or the network.
* @throws IllegalStateException if an unavailable servlet has been requested.
*/
@@ -451,7 +461,7 @@
try {
Servlet servlet = (Servlet)Reflect.newInstance(Class.forName(servletClass), hostServer);
String webPath = "/" + path;
- new org.mortbay.jetty.servlet.Context(server, webPath, SESSIONS).addServlet(new ServletHolder(servlet), "/*");
+ new org.eclipse.jetty.servlet.ServletContextHandler(getHandlerCollection(server), webPath, SESSIONS).addServlet(new ServletHolder(servlet), "/*");
return new Service(description, webPath);
} catch (ClassNotFoundException e) {
throw new IllegalStateException("Not configured to use the requested servlet: " + description);
@@ -467,9 +477,26 @@
private void addWebServiceListingContext(Server server, Map<String,String> services) throws IOException {
if (logger.isDebugEnabled()) logger.debug("Adding the service lister context");
Servlet servlet = new ServiceListingServlet(services, "/" + DEFAULT_SERVICE);
- new org.mortbay.jetty.servlet.Context(server, "/", SESSIONS).addServlet(new ServletHolder(servlet), "/*");
+ new org.eclipse.jetty.servlet.ServletContextHandler(getHandlerCollection(server), "/", SESSIONS).addServlet(new ServletHolder(servlet), "/*");
}
+ /**
+ * Retrieves a handler collection from the server, setting it if the server does not hold a collection.
+ * @param server The server to get a handler collection from.
+ * @return A handler collection for the server.
+ */
+ private HandlerContainer getHandlerCollection(Server server) {
+ HandlerCollection handlerCollection;
+ Handler handler = server.getHandler();
+ if (handler instanceof HandlerCollection) {
+ handlerCollection = (HandlerCollection)handler;
+ } else {
+ handlerCollection = new HandlerCollection();
+ if (handler != null) handlerCollection.addHandler(handler);
+ server.setHandler(handlerCollection);
+ }
+ return handlerCollection;
+ }
/**
* Extracts a resource from the environment (a jar in the classpath) and writes
Modified: trunk/src/jar/server-http/build.xml
===================================================================
--- trunk/src/jar/server-http/build.xml 2010-10-01 04:11:19 UTC (rev 1980)
+++ trunk/src/jar/server-http/build.xml 2010-10-01 04:17:29 UTC (rev 1981)
@@ -147,7 +147,7 @@
<manifest file="${obj.dir}/META-INF/MANIFEST_Mulgara_HTTP_BOOTSTRAP.MF">
<attribute name="Main-Class" value="org.mulgara.util.Bootstrap"/>
- <attribute name="Embedded-Jar" value="lib/${driver.jar}, lib/${query.jar},lib/${querylang.jar}, lib/${server.jar}, lib/${util.jar}, lib/${config.jar}, lib/activation-1.0.2.jar, lib/icu4j.jar, lib/${jena.jar}, lib/${iri.jar}, lib/antlr.jar, lib/${commons-logging.jar}, lib/log4j-1.2.15.jar, lib/mail-1.3.jar, lib/${jetty.jar},lib/${jetty.plus.jar}, lib/${jasper.runtime.jar}, lib/${servlet.jar}, lib/jargs-0.2.jar,lib/${castor-xml.jar}, lib/${castor-xml-schema.jar}, lib/${xerces.jar}, lib/${xmlParserAPIs.jar}, lib/${jrdf.jar},lib/jakarta-oro-2.0.5.jar, lib/${emory-util.jar}, lib/${sesame-model.jar}"/>
+ <attribute name="Embedded-Jar" value="lib/${driver.jar}, lib/${query.jar},lib/${querylang.jar}, lib/${server.jar}, lib/${util.jar}, lib/${config.jar}, lib/activation-1.0.2.jar, lib/icu4j.jar, lib/${jena.jar}, lib/${iri.jar}, lib/antlr.jar, lib/${commons-logging.jar}, lib/log4j-1.2.15.jar, lib/mail-1.3.jar, lib/${jetty.jar},lib/${jetty.plus.jar}, lib/${jsp-core.jar}, lib/${jsp-el.jar}, lib/${jsp-ecj.jar}, lib/${jsp-javax-el.jar}, lib/${jsp-javax-jstl.jar}, lib/${jsp-javax-jsp.jar}, lib/${jsp-jetty.jar}, lib/${jsp-glassfish.jar}, lib/${jsp-glassfish-taglibs.jar}, lib/${servlet.jar}, lib/jargs-0.2.jar,lib/${castor-xml.jar}, lib/${castor-xml-schema.jar}, lib/${xerces.jar}, lib/${xmlParserAPIs.jar}, lib/${jrdf.jar},lib/jakarta-oro-2.0.5.jar, lib/${emory-util.jar}, lib/${sesame-model.jar}"/>
<attribute name="Embedded-Main-Class" value="org.mulgara.server.EmbeddedMulgaraHttpServer"/>
</manifest>
@@ -171,7 +171,7 @@
<zipfileset dir="${lib.dir}" prefix="lib"
includes="log4j*.jar, icu4j.jar, ${jena.jar}, ${iri.jar}, antlr*.jar, ${commons-logging.jar},
activation*.jar, jargs*.jar,
- ${jetty.jar}, ${jetty.plus.jar}, ${servlet.jar}, ${jasper.runtime.jar},
+ ${jetty.jar}, ${jetty.plus.jar}, ${servlet.jar}, ${jasper.jar},
${xerces.jar}, mail-*.jar, castor*.jar, ${trove.jar}, ${jrdf.jar}, ${emory-util.jar}, ${sesame-model.jar}"/>
<zipfileset dir="${bin.dir}" prefix="lib" includes="${query.jar},
${driver.jar}, ${querylang.jar}, ${server.jar},
Modified: trunk/src/jar/tag/build.xml
===================================================================
--- trunk/src/jar/tag/build.xml 2010-10-01 04:11:19 UTC (rev 1980)
+++ trunk/src/jar/tag/build.xml 2010-10-01 04:17:29 UTC (rev 1981)
@@ -23,7 +23,15 @@
<pathelement path="${query.dist.dir}/${query.jar}"/>
- <fileset file="${lib.dir}/${servlet-jsp.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-core.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-el.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-ecj.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-javax-el.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-javax-jstl.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-javax-jsp.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-jetty.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-glassfish.jar}"/>
+ <pathelement location="${lib.dir}/${jsp-glassfish-taglibs.jar}"/>
</path>
<path id="tag-test-classpath">
Copied: trunk/src/jar/util/java/org/mulgara/util/JettyLogger.java (from rev 1976, trunk/src/jar/util/java/org/mulgara/util/MortbayLogger.java)
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/JettyLogger.java (rev 0)
+++ trunk/src/jar/util/java/org/mulgara/util/JettyLogger.java 2010-10-01 04:17:29 UTC (rev 1981)
@@ -0,0 +1,240 @@
+/*
+ * Copyright 2008 Fedora Commons, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.mulgara.util;
+
+import org.eclipse.jetty.util.log.Logger;
+
+/**
+ * This class is used for managing logging by the Jetty libraries.
+ * It can be set to send to the standard logging facilities, or set to ignore everything.
+ * @see org.eclipse.jetty.log.Logger
+ *
+ * @created Aug 6, 2008
+ * @author Paul Gearon
+ * @copyright © 2008 <a href="http://www.fedora-commons.org/">Fedora Commons</a>
+ */
+public class JettyLogger implements Logger {
+
+ /** The Log4J logger this class can proxy for. */
+ protected static org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(JettyLogger.class.getName());
+
+ /**
+ * The property that has to be set to this class in order for this class to be loaded
+ * as the logger for org.eclipse.jetty.* classes.
+ */
+ public static final String LOGGING_CLASS_PROPERTY = "org.eclipse.jetty.util.log.class";
+
+ /** This flag turns logging on and off. */
+ static boolean enabled = false;
+
+ /** This flag turns debug logging on and off. */
+ boolean debugEnabled = true;
+
+ /** The name of this object. */
+ private String name;
+
+
+ /**
+ * Sets all instances of this logger on and off.
+ * @param enabled when <code>false</code> this logger will not do anything.
+ */
+ public static void setEnabled(boolean enabled) {
+ JettyLogger.enabled = enabled;
+ }
+
+
+ /**
+ * Returns the enabled state for all instances of this logging class.
+ * @return <code>true</code> if this class logs anything.
+ */
+ public static boolean isEnabled() {
+ return enabled;
+ }
+
+
+ /**
+ * Creates a logger with a default name.
+ */
+ public JettyLogger() {
+ this.name = getClass().getName() + System.identityHashCode(this);
+ }
+
+
+ /**
+ * Creates a named logger.
+ * @param name The name for this logger.
+ */
+ public JettyLogger(String name) {
+ this.name = name;
+ }
+
+
+ /**
+ * Logs a debug message and Throwable.
+ * @param msg The message to log.
+ * @param th The Throwable relevant to this log.
+ */
+ public void debug(String msg, Throwable th) {
+ if (enabled && debugEnabled) log.debug(msg, th);
+ }
+
+
+ /**
+ * Logs a debug message, and optionally up to 2 objects. These appear in the message
+ * replacing the first 2 instances of "{}" characters, if such characters exist.
+ * @param msg The message to log.
+ * @param arg0 Data to replace the first "{}" sequence in <var>msg</var>.
+ * @param arg1 Data to replace the second "{}" sequence in <var>msg</var>.
+ */
+ public void debug(String msg, Object arg0, Object arg1) {
+ if (enabled && debugEnabled) log.debug(format(msg, arg0, arg1));
+ }
+
+
+ /**
+ * Get an instance of a Logger for a given name.
+ * @param name The name of the logger to return. If <code>null</code> or empty
+ * then the name of the current logger is used.
+ * @return A logger with the name from the <var>name</var> parameter, or the current logger
+ * if no name was given.
+ */
+ public Logger getLogger(String name) {
+ if (name == null || name.equals("") || name.equals(this.name)) return this;
+ return new JettyLogger(name);
+ }
+
+
+ /**
+ * Logs an info message, and optionally up to 2 objects. These appear in the message
+ * replacing the first 2 instances of "{}" characters, if such characters exist.
+ * @param msg The message to log.
+ * @param arg0 Data to replace the first "{}" sequence in <var>msg</var>.
+ * @param arg1 Data to replace the second "{}" sequence in <var>msg</var>.
+ */
+ public void info(String msg, Object arg0, Object arg1) {
+ if (enabled) log.info(format(msg, arg0, arg1));
+ }
+
+
+ /**
+ * Indicates if debug messages are logged.
+ * @return <code>true</code> if debug messages are acted on.
+ */
+ public boolean isDebugEnabled() {
+ return debugEnabled;
+ }
+
+
+ /**
+ * Set whether or not to log debug messages.
+ * @param enabled <code>true</code> if debug messages are to be acted on.
+ */
+ public void setDebugEnabled(boolean enabled) {
+ debugEnabled = enabled;
+ }
+
+
+ /**
+ * Logs a warning message and Throwable.
+ * @param msg The message to log.
+ * @param th The Throwable relevant to this log.
+ */
+ public void warn(String msg, Throwable th) {
+ if (enabled) log.warn(msg, th);
+ }
+
+
+ /**
+ * Logs a warning message, and optionally up to 2 objects. These appear in the message
+ * replacing the first 2 instances of "{}" characters, if such characters exist.
+ * @param msg The message to log.
+ * @param arg0 Data to replace the first "{}" sequence in <var>msg</var>.
+ * @param arg1 Data to replace the second "{}" sequence in <var>msg</var>.
+ */
+ public void warn(String msg, Object arg0, Object arg1) {
+ if (enabled) log.warn(format(msg, arg0, arg1));
+ }
+
+
+ /**
+ * Writes 2 objects into a string, replacing the instances of {} with the objects.
+ * @param msg The message with the two {} instances.
+ * @param arg0 The first object to print.
+ * @param arg1 The second object to print.
+ * @return The new string with the objects inserted.
+ */
+ private String format(String msg, Object arg0, Object arg1) {
+ int i0 = msg.indexOf("{}");
+ int i1 = i0 < 0 ? -1 : msg.indexOf("{}", i0 + 2);
+
+ if (arg1 != null && i1 >= 0) {
+ msg=msg.substring(0, i1) + arg1 + msg.substring(i1 + 2);
+ }
+ if (arg0 != null && i0 >= 0) {
+ msg = msg.substring(0, i0) + arg0 + msg.substring(i0 + 2);
+ }
+ return msg;
+ }
+
+
+ @Override
+ public void debug(Throwable msg) {
+ if (enabled && debugEnabled) log.debug(msg);
+ }
+
+
+ @Override
+ public void debug(String arg0, Object... arg1) {
+ if (enabled && debugEnabled) log.debug(String.format(arg0, arg1));
+ }
+
+
+ @Override
+ public String getName() {
+ return JettyLogger.class.getName() + "@" + System.identityHashCode(this);
+ }
+
+
+ @Override
+ public void info(Throwable arg0) {
+ if (enabled) log.info(arg0);
+ }
+
+
+ @Override
+ public void info(String arg0, Object... arg1) {
+ if (enabled) log.info(String.format(arg0, arg1));
+ }
+
+
+ @Override
+ public void info(String arg0, Throwable arg1) {
+ if (enabled) log.info(arg0, arg1);
+ }
+
+
+ @Override
+ public void warn(Throwable arg0) {
+ if (enabled) log.warn(arg0);
+ }
+
+
+ @Override
+ public void warn(String arg0, Object... arg1) {
+ if (enabled) log.warn(String.format(arg0, arg1));
+ }
+}
Deleted: trunk/src/jar/util/java/org/mulgara/util/MortbayLogger.java
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/MortbayLogger.java 2010-10-01 04:11:19 UTC (rev 1980)
+++ trunk/src/jar/util/java/org/mulgara/util/MortbayLogger.java 2010-10-01 04:17:29 UTC (rev 1981)
@@ -1,192 +0,0 @@
-/*
- * Copyright 2008 Fedora Commons, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.mulgara.util;
-
-import org.mortbay.log.Logger;
-
-/**
- * This class is used for managing logging by the Mortbay libraries.
- * It can be set to send to the standard logging facilities, or set to ignore everything.
- * @see org.mortbay.log.Logger
- *
- * @created Aug 6, 2008
- * @author Paul Gearon
- * @copyright © 2008 <a href="http://www.fedora-commons.org/">Fedora Commons</a>
- */
-public class MortbayLogger implements Logger {
-
- /** The Log4J logger this class can proxy for. */
- protected static org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(MortbayLogger.class.getName());
-
- /**
- * The property that has to be set to this class in order for this class to be loaded
- * as the logger for org.mortbay.* classes.
- */
- public static final String LOGGING_CLASS_PROPERTY = "org.mortbay.log.class";
-
- /** This flag turns logging on and off. */
- static boolean enabled = false;
-
- /** This flag turns debug logging on and off. */
- boolean debugEnabled = true;
-
- /** The name of this object. */
- private String name;
-
-
- /**
- * Sets all instances of this logger on and off.
- * @param enabled when <code>false</code> this logger will not do anything.
- */
- public static void setEnabled(boolean enabled) {
- MortbayLogger.enabled = enabled;
- }
-
-
- /**
- * Returns the enabled state for all instances of this logging class.
- * @return <code>true</code> if this class logs anything.
- */
- public static boolean isEnabled() {
- return enabled;
- }
-
-
- /**
- * Creates a logger with a default name.
- */
- public MortbayLogger() {
- this.name = getClass().getName() + System.identityHashCode(this);
- }
-
-
- /**
- * Creates a named logger.
- * @param name The name for this logger.
- */
- public MortbayLogger(String name) {
- this.name = name;
- }
-
-
- /**
- * Logs a debug message and Throwable.
- * @param msg The message to log.
- * @param th The Throwable relevant to this log.
- */
- public void debug(String msg, Throwable th) {
- if (enabled && debugEnabled) log.debug(msg, th);
- }
-
-
- /**
- * Logs a debug message, and optionally up to 2 objects. These appear in the message
- * replacing the first 2 instances of "{}" characters, if such characters exist.
- * @param msg The message to log.
- * @param arg0 Data to replace the first "{}" sequence in <var>msg</var>.
- * @param arg1 Data to replace the second "{}" sequence in <var>msg</var>.
- */
- public void debug(String msg, Object arg0, Object arg1) {
- if (enabled && debugEnabled) log.debug(format(msg, arg0, arg1));
- }
-
-
- /**
- * Get an instance of a Logger for a given name.
- * @param name The name of the logger to return. If <code>null</code> or empty
- * then the name of the current logger is used.
- * @return A logger with the name from the <var>name</var> parameter, or the current logger
- * if no name was given.
- */
- public Logger getLogger(String name) {
- if (name == null || name.equals("") || name.equals(this.name)) return this;
- return new MortbayLogger(name);
- }
-
-
- /**
- * Logs an info message, and optionally up to 2 objects. These appear in the message
- * replacing the first 2 instances of "{}" characters, if such characters exist.
- * @param msg The message to log.
- * @param arg0 Data to replace the first "{}" sequence in <var>msg</var>.
- * @param arg1 Data to replace the second "{}" sequence in <var>msg</var>.
- */
- public void info(String msg, Object arg0, Object arg1) {
- if (enabled) log.info(format(msg, arg0, arg1));
- }
-
-
- /**
- * Indicates if debug messages are logged.
- * @return <code>true</code> if debug messages are acted on.
- */
- public boolean isDebugEnabled() {
- return debugEnabled;
- }
-
-
- /**
- * Set whether or not to log debug messages.
- * @param enabled <code>true</code> if debug messages are to be acted on.
- */
- public void setDebugEnabled(boolean enabled) {
- debugEnabled = enabled;
- }
-
-
- /**
- * Logs a warning message and Throwable.
- * @param msg The message to log.
- * @param th The Throwable relevant to this log.
- */
- public void warn(String msg, Throwable th) {
- if (enabled) log.warn(msg, th);
- }
-
-
- /**
- * Logs a warning message, and optionally up to 2 objects. These appear in the message
- * replacing the first 2 instances of "{}" characters, if such characters exist.
- * @param msg The message to log.
- * @param arg0 Data to replace the first "{}" sequence in <var>msg</var>.
- * @param arg1 Data to replace the second "{}" sequence in <var>msg</var>.
- */
- public void warn(String msg, Object arg0, Object arg1) {
- if (enabled) log.warn(format(msg, arg0, arg1));
- }
-
-
- /**
- * Writes 2 objects into a string, replacing the instances of {} with the objects.
- * @param msg The message with the two {} instances.
- * @param arg0 The first object to print.
- * @param arg1 The second object to print.
- * @return The new string with the objects inserted.
- */
- private String format(String msg, Object arg0, Object arg1) {
- int i0 = msg.indexOf("{}");
- int i1 = i0 < 0 ? -1 : msg.indexOf("{}", i0 + 2);
-
- if (arg1 != null && i1 >= 0) {
- msg=msg.substring(0, i1) + arg1 + msg.substring(i1 + 2);
- }
- if (arg0 != null && i0 >= 0) {
- msg = msg.substring(0, i0) + arg0 + msg.substring(i0 + 2);
- }
- return msg;
- }
-}
Modified: trunk/src/war/web-services/WEB-INF/web.xml
===================================================================
--- trunk/src/war/web-services/WEB-INF/web.xml 2010-10-01 04:11:19 UTC (rev 1980)
+++ trunk/src/war/web-services/WEB-INF/web.xml 2010-10-01 04:17:29 UTC (rev 1981)
@@ -78,12 +78,12 @@
<servlet>
<servlet-name>error_jsp</servlet-name>
- <servlet-class>error_jsp</servlet-class>
+ <servlet-class>org.apache.jsp.error_jsp</servlet-class>
</servlet>
<servlet>
<servlet-name>index_jsp</servlet-name>
- <servlet-class>index_jsp</servlet-class>
+ <servlet-class>org.apache.jsp.index_jsp</servlet-class>
</servlet>
<!-- descriptor mappings -->
<servlet-mapping>
More information about the Mulgara-svn
mailing list