[Mulgara-svn] r1189 - in trunk: . src/jar src/jar/server src/jar/web src/jar/web/resources
pag at mulgara.org
pag at mulgara.org
Thu Aug 28 01:24:00 UTC 2008
Author: pag
Date: 2008-08-27 18:23:59 -0700 (Wed, 27 Aug 2008)
New Revision: 1189
Added:
trunk/src/jar/web/
Removed:
trunk/src/jar/webquery/
Modified:
trunk/build.xml
trunk/src/jar/server/build.xml
trunk/src/jar/web/build.xml
trunk/src/jar/web/resources/template.html
trunk/src/jar/web/resources/template_head.html
trunk/src/jar/web/webquery-build.properties
Log:
renamed webquery to web
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-08-27 22:40:50 UTC (rev 1188)
+++ trunk/build.xml 2008-08-28 01:23:59 UTC (rev 1189)
@@ -72,7 +72,7 @@
<property file="${jar.src.dir}/tuples/tuples-build.properties"/>
<property file="${jar.src.dir}/util-xa/util-xa-build.properties"/>
<property file="${jar.src.dir}/util/util-build.properties"/>
- <property file="${jar.src.dir}/webquery/webquery-build.properties"/>
+ <property file="${jar.src.dir}/web/webquery-build.properties"/>
<property name="webui.viewer.src.dir"
value="${webui.src.dir}/java/org/mulgara/webui/viewer"/>
@@ -145,7 +145,7 @@
<import file="${jar.src.dir}/tuples/build.xml"/>
<import file="${jar.src.dir}/util-xa/build.xml"/>
<import file="${jar.src.dir}/util/build.xml"/>
- <import file="${jar.src.dir}/webquery/build.xml"/>
+ <import file="${jar.src.dir}/web/build.xml"/>
<!-- =================================================================== -->
<!-- Path Definitions -->
@@ -354,7 +354,7 @@
store-stringpool-xa-dist,
store-stringpool-xa11-dist, tag-dist,
tuples-dist, tuples-hybrid-dist,
- util-dist, util-xa-dist, webquery-dist"
+ util-dist, util-xa-dist, web-dist"
description="Creates the distribution base jars">
</target>
@@ -771,7 +771,7 @@
sofa-jar, krule-jar, rules-jar, sparql-protocol-jar,
store-stringpool-jar,
store-stringpool-memory-jar, store-stringpool-xa-jar, store-stringpool-xa11-jar,
- tuples-jar, tuples-hybrid-jar, util-jar, util-xa-jar, webui-war, webquery-jar"
+ tuples-jar, tuples-hybrid-jar, util-jar, util-xa-jar, webui-war, web-jar"
unless="javadoc-uptodate"
description="Creates the project javadoc">
<delete dir="${javadoc.dir}"/>
@@ -894,7 +894,7 @@
<sourcepath path="${util.src.dir}/java"/>
<sourcepath path="${util-xa.src.dir}/java"/>
<sourcepath path="${webui.src.dir}/java"/>
- <sourcepath path="${webquery.src.dir}/java"/>
+ <sourcepath path="${web.src.dir}/java"/>
<sourcepath path="${obj.dir}/jar/config/java"/>
<sourcepath path="${obj.dir}/jar/itql/java"/>
<sourcepath path="${obj.dir}/jar/query/java"/>
@@ -1739,7 +1739,7 @@
sofa-jar, rules-jar, krule-jar, store-stringpool-jar, store-stringpool-memory-jar,
store-stringpool-xa-jar, store-stringpool-xa11-jar, tuples-jar,
tuples-hybrid-jar, util-jar, util-xa-jar,
- webservices-war, webui-war, webquery-jar, -embedded-dist-uptodate"
+ webservices-war, webui-war, web-jar, -embedded-dist-uptodate"
description="Creates the executable JAR for the Embedded Mulgara server"
unless="embedded.dist.uptodate">
@@ -1863,7 +1863,7 @@
<zipfileset src="${bin.dir}/${jrdf.base.jar}" excludes="META-INF/**"/>
<zipfileset src="${bin.dir}/${rules.jar}" excludes="META-INF/**"/>
<zipfileset src="${bin.dir}/${krule.jar}" excludes="META-INF/**"/>
- <zipfileset src="${bin.dir}/${webquery.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${web.jar}" excludes="META-INF/**"/>
<!-- include pre-bundled webapps -->
@@ -1910,7 +1910,7 @@
server-jar, server-beep-jar, server-rmi-jar,
sofa-jar, rules-jar, krule-jar, store-stringpool-jar, store-stringpool-memory-jar,
store-stringpool-xa-jar, store-stringpool-xa11-jar, tuples-jar,
- tuples-hybrid-jar, util-jar, util-xa-jar, webquery-jar,
+ tuples-hybrid-jar, util-jar, util-xa-jar, web-jar,
-embedded-dist-uptodate"
description="core dist for embedded apps, without 3rd party libs"
unless="embedded.dist.uptodate">
@@ -1969,7 +1969,7 @@
<zipfileset src="${bin.dir}/${jrdf.base.jar}" excludes="META-INF/**"/>
<zipfileset src="${bin.dir}/${rules.jar}" excludes="META-INF/**"/>
<zipfileset src="${bin.dir}/${krule.jar}" excludes="META-INF/**"/>
- <zipfileset src="${bin.dir}/${webquery.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${bin.dir}/${web.jar}" excludes="META-INF/**"/>
</jar>
</target>
Modified: trunk/src/jar/server/build.xml
===================================================================
--- trunk/src/jar/server/build.xml 2008-08-27 22:40:50 UTC (rev 1188)
+++ trunk/src/jar/server/build.xml 2008-08-28 01:23:59 UTC (rev 1189)
@@ -25,7 +25,7 @@
<fileset file="${store.dist.dir}/${store.jar}"/>
<fileset file="${store-xa.dist.dir}/${store-xa.jar}"/>
<fileset file="${resolver-spi.dist.dir}/${resolver-spi.jar}"/>
- <fileset file="${webquery.dist.dir}/${webquery.jar}"/>
+ <fileset file="${web.dist.dir}/${web.jar}"/>
<fileset file="${util.dist.dir}/${util.jar}"/>
<fileset file="${util-xa.dist.dir}/${util-xa.jar}"/>
</path>
Copied: trunk/src/jar/web (from rev 1182, trunk/src/jar/webquery)
Modified: trunk/src/jar/web/build.xml
===================================================================
--- trunk/src/jar/webquery/build.xml 2008-08-26 20:30:01 UTC (rev 1182)
+++ trunk/src/jar/web/build.xml 2008-08-28 01:23:59 UTC (rev 1189)
@@ -4,7 +4,7 @@
<!-- =================================================================== -->
<!-- Project definition -->
<!-- =================================================================== -->
-<project name="webquery" default="webquery-jar" basedir="../../..">
+<project name="web" default="web-jar" basedir="../../..">
<!-- =================================================================== -->
<!-- Property Definitions -->
@@ -17,7 +17,7 @@
<!-- =================================================================== -->
<!-- Path Definitions -->
<!-- =================================================================== -->
- <path id="webquery-classpath">
+ <path id="web-classpath">
<path refid="common-classpath"/>
<fileset file="${util.dist.dir}/${util.jar}"/>
<fileset file="${query.dist.dir}/${query.jar}"/>
@@ -28,102 +28,102 @@
<fileset file="${lib.dir}/${servlet.jar}"/>
</path>
- <path id="webquery-test-classpath">
- <path refid="webquery-classpath"/>
- <fileset file="${webquery.dist.dir}/${webquery.jar}"/>
+ <path id="web-test-classpath">
+ <path refid="web-classpath"/>
+ <fileset file="${web.dist.dir}/${web.jar}"/>
</path>
- <target name="webquery-clean" description="Removes all compile generated files for the webquery">
+ <target name="web-clean" description="Removes all compile generated files for the web">
<tstamp/>
- <delete dir="${webquery.obj.dir}"/>
- <delete dir="${webquery.test.dir}"/>
- <delete dir="${webquery.dist.dir}"/>
+ <delete dir="${web.obj.dir}"/>
+ <delete dir="${web.test.dir}"/>
+ <delete dir="${web.dist.dir}"/>
</target>
- <target name="-webquery-prepare"
- description="Creates all directories associated with the webquery's compilation"
+ <target name="-web-prepare"
+ description="Creates all directories associated with the web's compilation"
depends="-prepare-build">
- <mkdir dir="${webquery.obj.dir}"/>
- <mkdir dir="${webquery.test.dir}"/>
- <mkdir dir="${webquery.dist.dir}"/>
- <mkdir dir="${webquery.obj.dir}/classes"/>
- <mkdir dir="${webquery.obj.dir}/classes/conf"/>
- <mkdir dir="${webquery.obj.dir}/java"/>
+ <mkdir dir="${web.obj.dir}"/>
+ <mkdir dir="${web.test.dir}"/>
+ <mkdir dir="${web.dist.dir}"/>
+ <mkdir dir="${web.obj.dir}/classes"/>
+ <mkdir dir="${web.obj.dir}/classes/conf"/>
+ <mkdir dir="${web.obj.dir}/java"/>
</target>
- <target name="-webquery-unjar-config"
- depends="-webquery-unjar-config-uptodate"
- unless="webquery.unjar.config.uptodate">
- <unjar src="${bin.dir}/${config.jar}" dest="${webquery.obj.dir}/classes"/>
+ <target name="-web-unjar-config"
+ depends="-web-unjar-config-uptodate"
+ unless="web.unjar.config.uptodate">
+ <unjar src="${bin.dir}/${config.jar}" dest="${web.obj.dir}/classes"/>
</target>
- <target name="-webquery-unjar-config-uptodate">
- <available file="${webquery.obj.dir}/classes/org/mulgara/config/MulgaraConfig.class"
- property="webquery.unjar.config.uptodate"/>
+ <target name="-web-unjar-config-uptodate">
+ <available file="${web.obj.dir}/classes/org/mulgara/config/MulgaraConfig.class"
+ property="web.unjar.config.uptodate"/>
</target>
- <target name="webquery-compile"
- depends="-webquery-prepare, util-jar, config-jar, itql-jar, query-jar, -webquery-unjar-config"
- description="Compiles all webquery related files included generated
+ <target name="web-compile"
+ depends="-web-prepare, util-jar, config-jar, itql-jar, query-jar, -web-unjar-config"
+ description="Compiles all web related files included generated
source code"
- unless="webquery.classes.uptodate">
+ unless="web.classes.uptodate">
- <javac destdir="${webquery.obj.dir}/classes" debug="on" deprecation="on" source="1.5">
- <classpath refid="webquery-classpath"/>
- <src path="${webquery.src.dir}/java"/>
+ <javac destdir="${web.obj.dir}/classes" debug="on" deprecation="on" source="1.5">
+ <classpath refid="web-classpath"/>
+ <src path="${web.src.dir}/java"/>
</javac>
</target>
- <target name="webquery-jar"
- depends="webquery-compile, config-database, -webquery-jar-uptodate"
- unless="webquery.jar.uptodate"
- description="Creates the webquery's jar/s">
+ <target name="web-jar"
+ depends="web-compile, config-database, -web-jar-uptodate"
+ unless="web.jar.uptodate"
+ description="Creates the web's jar/s">
- <jar jarfile="${webquery.dist.dir}/${webquery.jar}">
- <fileset dir="${webquery.obj.dir}/classes"/>
- <fileset dir="${webquery.src.dir}" includes="resources/**/*"/>
+ <jar jarfile="${web.dist.dir}/${web.jar}">
+ <fileset dir="${web.obj.dir}/classes"/>
+ <fileset dir="${web.src.dir}" includes="resources/**/*"/>
</jar>
</target>
- <target name="-webquery-jar-uptodate">
- <uptodate property="webquery.jar.uptodate"
- targetfile="${webquery.dist.dir}/${webquery.jar}">
- <srcfiles dir="${webquery.obj.dir}" includes="**/*"/>
- <srcfiles dir="${webquery.src.dir}" includes="resources/**/*"/>
+ <target name="-web-jar-uptodate">
+ <uptodate property="web.jar.uptodate"
+ targetfile="${web.dist.dir}/${web.jar}">
+ <srcfiles dir="${web.obj.dir}" includes="**/*"/>
+ <srcfiles dir="${web.src.dir}" includes="resources/**/*"/>
</uptodate>
</target>
- <target name="webquery-dist"
- depends="webquery-jar"
- unless="webquery.uptodate"
- description="Performs all tasks related to finalising this webquery
+ <target name="web-dist"
+ depends="web-jar"
+ unless="web.uptodate"
+ description="Performs all tasks related to finalising this web
and readying it for distribution">
- <!-- All that's involved in the final version of the webquery library
+ <!-- All that's involved in the final version of the web library
is the jar so we don't need to do anything because the dependencies
take care of the work. -->
</target>
- <target name="webquery-test" depends="webquery-jar"
- description="Carries out unit testing for this webquery">
+ <target name="web-test" depends="web-jar"
+ description="Carries out unit testing for this web">
<antcall target="component-test">
- <param name="classpath.id" value="webquery-test-classpath"/>
- <param name="dir" value="${webquery.src.dir}"/>
- <param name="jar" value="${webquery.jar}"/>
+ <param name="classpath.id" value="web-test-classpath"/>
+ <param name="dir" value="${web.src.dir}"/>
+ <param name="jar" value="${web.jar}"/>
</antcall>
</target>
- <target name="webquery-javadoc" depends="webquery-jar"
- description="Creates the javadoc for this webquery">
+ <target name="web-javadoc" depends="web-jar"
+ description="Creates the javadoc for this web">
<antcall target="javadoc">
- <param name="javadoc.package" value="org.mulgara.webquery.*"/>
- <param name="javadoc.classpath" value="webquery-classpath"/>
- <param name="javadoc.sourcepath" value="${webquery.src.dir}/java"/>
+ <param name="javadoc.package" value="org.mulgara.web.*"/>
+ <param name="javadoc.classpath" value="web-classpath"/>
+ <param name="javadoc.sourcepath" value="${web.src.dir}/java"/>
</antcall>
</target>
- <target name="webquery-help" description="Displays the help information for this webquery">
+ <target name="web-help" description="Displays the help information for this web">
<echo message="Welcome to the build script for ${name}."/>
<echo message=""/>
<echo message="These targets can be invoked as follows:"/>
@@ -131,7 +131,7 @@
<echo message=""/>
<java fork="false" classname="org.apache.tools.ant.Main" newenvironment="false">
<jvmarg value="${arch.bits}"/>
- <arg line="-buildfile ${webquery.src.dir}/build.xml -projecthelp"/>
+ <arg line="-buildfile ${web.src.dir}/build.xml -projecthelp"/>
</java>
</target>
</project>
Modified: trunk/src/jar/web/resources/template.html
===================================================================
--- trunk/src/jar/webquery/resources/template.html 2008-08-26 20:30:01 UTC (rev 1182)
+++ trunk/src/jar/web/resources/template.html 2008-08-28 01:23:59 UTC (rev 1189)
@@ -70,7 +70,7 @@
<option value="select $subject $predicate $object from <-graph-> where $subject $predicate $object;">Step 3. List everything in the graph</option>
<option value="select $title $link $description from <-graph-> where $article <http://purl.org/rss/1.0/title> $title and $article <http://purl.org/rss/1.0/link> $link and $article <http://purl.org/rss/1.0/description> $description;">Step 4. List the news articles</option>
<option value="create <rmi://@@hostname@@/@@servername@@#rdfs>;">Step 5. Create a standalone RDF schema graph</option>
- <option value="load <@@jarurl@@!/data/rss-1.0.rdfs> into <rmi://@@hostname@@/@@servername@@#rdfs>; load <jar:file:/Users/pag/debug/mulgara-2.0.0.jar!/data/dc.rdfs> into <rmi://@@hostname@@/@@servername@@#rdfs>; load <@@jarurl@@!/data/rdfs.rdfs> into <rmi://@@hostname@@/@@servername@@#rdfs>;">Step 6. Load in the referenced schemas</option>
+ <option value="load <@@jarurl@@!/data/rss-1.0.rdfs> into <rmi://@@hostname@@/@@servername@@#rdfs>; load <@@jarurl@@!/data/dc.rdfs> into <rmi://@@hostname@@/@@servername@@#rdfs>; load <@@jarurl@@!/data/rdfs.rdfs> into <rmi://@@hostname@@/@@servername@@#rdfs>;">Step 6. Load in the referenced schemas</option>
<option value="select $rdfSubject $rdfProperty $value from <-graph-> or <rmi://@@hostname@@/@@servername@@#rdfs> where $rdfSubject $rdfProperty $value and $rdfProperty <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> and $rdfProperty <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://purl.org/rss/1.0/>;">Step 7. List the RSS properties using both graphs</option>
<option value="drop <-graph->; drop <rmi://@@hostname@@/@@servername@@#rdfs>;">Step 8. Drop the graphs</option>
</select>
Modified: trunk/src/jar/web/resources/template_head.html
===================================================================
--- trunk/src/jar/webquery/resources/template_head.html 2008-08-26 20:30:01 UTC (rev 1182)
+++ trunk/src/jar/web/resources/template_head.html 2008-08-28 01:23:59 UTC (rev 1189)
@@ -70,7 +70,7 @@
<option value="select $subject $predicate $object from <-graph-> where $subject $predicate $object;">Step 3. List everything in the graph</option>
<option value="select $title $link $description from <-graph-> where $article <http://purl.org/rss/1.0/title> $title and $article <http://purl.org/rss/1.0/link> $link and $article <http://purl.org/rss/1.0/description> $description;">Step 4. List the news articles</option>
<option value="create <rmi://@@hostname@@/@@servername@@#rdfs>;">Step 5. Create a standalone RDF schema graph</option>
- <option value="load <@@jarurl@@!/data/rss-1.0.rdfs> into <rmi://@@hostname@@/@@servername@@#rdfs>; load <jar:file:/Users/pag/debug/mulgara-2.0.0.jar!/data/dc.rdfs> into <rmi://@@hostname@@/@@servername@@#rdfs>; load <@@jarurl@@!/data/rdfs.rdfs> into <rmi://@@hostname@@/@@servername@@#rdfs>;">Step 6. Load in the referenced schemas</option>
+ <option value="load <@@jarurl@@!/data/rss-1.0.rdfs> into <rmi://@@hostname@@/@@servername@@#rdfs>; load <@@jarurl@@!/data/dc.rdfs> into <rmi://@@hostname@@/@@servername@@#rdfs>; load <@@jarurl@@!/data/rdfs.rdfs> into <rmi://@@hostname@@/@@servername@@#rdfs>;">Step 6. Load in the referenced schemas</option>
<option value="select $rdfSubject $rdfProperty $value from <-graph-> or <rmi://@@hostname@@/@@servername@@#rdfs> where $rdfSubject $rdfProperty $value and $rdfProperty <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> and $rdfProperty <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://purl.org/rss/1.0/>;">Step 7. List the RSS properties using both graphs</option>
<option value="drop <-graph->; drop <rmi://@@hostname@@/@@servername@@#rdfs>;">Step 8. Drop the graphs</option>
</select>
Modified: trunk/src/jar/web/webquery-build.properties
===================================================================
--- trunk/src/jar/webquery/webquery-build.properties 2008-08-26 20:30:01 UTC (rev 1182)
+++ trunk/src/jar/web/webquery-build.properties 2008-08-28 01:23:59 UTC (rev 1189)
@@ -1,15 +1,15 @@
#
-# Properties used by the webquery module
+# Properties used by the web module
#
# Module Name
-webquery.name = webquery
+web.name = web
# General module properties
-webquery.conf.dir = ${conf.dir}
-webquery.src.dir = ${jar.src.dir}/webquery
-webquery.obj.dir = ${jar.obj.dir}/webquery
-webquery.dist.dir = ${bin.dir}
-webquery.test.dir = ${test.dir}/webquery
-webquery.jxtest.dir = ${jxtest.dir}/webquery
-webquery.jar = webquery-base-${mulgara-version}.jar
+web.conf.dir = ${conf.dir}
+web.src.dir = ${jar.src.dir}/web
+web.obj.dir = ${jar.obj.dir}/web
+web.dist.dir = ${bin.dir}
+web.test.dir = ${test.dir}/web
+web.jxtest.dir = ${jxtest.dir}/web
+web.jar = web-base-${mulgara-version}.jar
More information about the Mulgara-svn
mailing list