commit - fd927aab445ad88006ae9ac70783927523f5ae8a
commit + eb48fb53360aa1ad2b664494054ed8f300e9b5a4
blob - e86862a28e464828cb71b81ea128aa5125deb316
blob + 45f18aabbef7dca1d9ac5a7cfd9048d48bb8605d
--- build.xml
+++ build.xml
<property file="conf/snipsnap.conf"/>
<path id="server.classpath">
- <pathelement location="${jar}/javax.servlet.jar"/>
- <pathelement location="${jar}/org.apache.jasper.jar"/>
- <pathelement location="${jar}/org.apache.crimson.jar"/>
- <pathelement location="${jar}/org.mortbay.jetty.jar"/>
- <pathelement location="${jar}/mckoidb.jar"/>
- <pathelement location="${jar}/commons-codec-1.3.jar"/>
- <pathelement location="${jar}/commons-logging.jar"/>
- <pathelement location="${jar}/httpclient-3.0-rc3.jar"/>
- <pathelement location="${jar}/xmlrpc-2.0.jar"/>
- <pathelement location="${jar}/jdic.jar"/>
- <pathelement location="${jar}/jdic.jar"/>
+ <pathelement location="${dir.libs}/javax.servlet.jar"/>
+ <pathelement location="${dir.libs}/org.apache.jasper.jar"/>
+ <pathelement location="${dir.libs}/org.apache.crimson.jar"/>
+ <pathelement location="${dir.libs}/org.mortbay.jetty.jar"/>
+ <pathelement location="${dir.libs}/mckoidb.jar"/>
+ <pathelement location="${dir.libs}/commons-codec-1.3.jar"/>
+ <pathelement location="${dir.libs}/commons-logging.jar"/>
+ <pathelement location="${dir.libs}/httpclient-3.0-rc3.jar"/>
+ <pathelement location="${dir.libs}/${xmlrpc.jar}"/>
+ <pathelement location="${dir.libs}/jdic.jar"/>
</path>
<path id="snipsnap.test">
- <pathelement location="${src}/apps/default/WEB-INF/lib/snipsnap-servlets.jar"/>
+ <pathelement location="${dir.src}/apps/default/WEB-INF/lib/snipsnap-servlets.jar"/>
</path>
<!-- the overall class path -->
<path id="app.classpath">
- <pathelement location="${jar}/${jdbcstorage.jar}"/>
- <pathelement location="${jar}/${rss-ng.jar}"/>
- <pathelement location="${jar}/${search-ng.jar}"/>
- <pathelement location="${jar}/gabriel.jar"/>
- <pathelement location="${jar}/jmdns.jar"/>
- <pathelement location="${jar}/${rome.jar}"/>
- <pathelement location="${jar}/${jdom.jar}"/>
- <pathelement location="${jar}/${spring-core.jar}"/>
- <pathelement location="${jar}/${spring-beans.jar}"/>
- <pathelement location="${jar}/asm-1.4.1.jar"/>
- <pathelement location="${jar}/dynaop-1.0-beta.jar"/>
- <pathelement location="${jar}/cglib-asm-1.0.jar"/>
- <pathelement location="${jar}/groovy-1.0-beta-6.jar"/>
- <pathelement location="${jar}/graph-snipsnap.jar"/>
- <pathelement location="${jar}/radeox.jar"/>
- <pathelement location="${jar}/jena.jar"/>
- <pathelement location="${jar}/commons-logging.jar"/>
- <pathelement location="${jar}/commons-dbcp-1.1.jar"/>
- <pathelement location="${jar}/commons-pool-1.1.jar"/>
- <pathelement location="${jar}/commons-collections.jar"/>
- <pathelement location="${jar}/commons-codec-1.3.jar"/>
- <pathelement location="${jar}/commons-httpclient-3.0-rc3.jar"/>
- <pathelement location="${jar}/xmlrpc-2.0.jar"/>
- <pathelement location="${jar}/lucene-1.4.1.jar"/>
- <pathelement location="${jar}/jython.jar"/>
- <pathelement location="${jar}/smack.jar"/>
- <pathelement location="${jar}/aspectjrt.jar"/>
- <pathelement location="${jar}/dom4j.jar"/>
- <pathelement location="${src}/apps/default/WEB-INF/lib/jstl.jar"/>
- <pathelement location="${src}/apps/default/WEB-INF/lib/standard.jar"/>
- <pathelement location="${jar}/activation.jar"/>
- <pathelement location="${jar}/mail.jar"/>
- <pathelement location="${jar}/cvslib.jar"/>
- <pathelement location="${jar}/j2h.jar"/>
- <pathelement location="${jar}/picocontainer-1.0.jar"/>
- <pathelement location="${jar}/nanocontainer-1.0.jar"/>
- <pathelement location="${jar}/nanocontainer-dynaop-1.0-beta-1-SNAPSHOT.jar"/>
- <pathelement location="${jar}/jmock-1.0.0.jar"/>
+ <pathelement location="${dir.libs}/${jdbcstorage.jar}"/>
+ <pathelement location="${dir.libs}/${rss-ng.jar}"/>
+ <pathelement location="${dir.libs}/${search-ng.jar}"/>
+ <pathelement location="${dir.libs}/gabriel.jar"/>
+ <pathelement location="${dir.libs}/jmdns.jar"/>
+ <pathelement location="${dir.libs}/${rome.jar}"/>
+ <pathelement location="${dir.libs}/${jdom.jar}"/>
+ <pathelement location="${dir.libs}/${spring-core.jar}"/>
+ <pathelement location="${dir.libs}/${spring-beans.jar}"/>
+ <pathelement location="${dir.libs}/asm-1.4.1.jar"/>
+ <pathelement location="${dir.libs}/dynaop-1.0-beta.jar"/>
+ <pathelement location="${dir.libs}/cglib-asm-1.0.jar"/>
+ <pathelement location="${dir.libs}/groovy-1.0-beta-6.jar"/>
+ <pathelement location="${dir.libs}/graph-snipsnap.jar"/>
+ <pathelement location="${dir.libs}/radeox.jar"/>
+ <pathelement location="${dir.libs}/jena.jar"/>
+ <pathelement location="${dir.libs}/commons-logging.jar"/>
+ <pathelement location="${dir.libs}/commons-dbcp-1.1.jar"/>
+ <pathelement location="${dir.libs}/commons-pool-1.1.jar"/>
+ <pathelement location="${dir.libs}/commons-collections.jar"/>
+ <pathelement location="${dir.libs}/commons-codec-1.3.jar"/>
+ <pathelement location="${dir.libs}/commons-httpclient-3.0-rc3.jar"/>
+ <pathelement location="${dir.libs}/${xmlrpc.jar}"/>
+ <pathelement location="${dir.libs}/lucene-1.4.1.jar"/>
+ <pathelement location="${dir.libs}/jython.jar"/>
+ <pathelement location="${dir.libs}/smack.jar"/>
+ <pathelement location="${dir.libs}/aspectjrt.jar"/>
+ <pathelement location="${dir.libs}/dom4j.jar"/>
+ <pathelement location="${dir.src}/apps/default/WEB-INF/lib/jstl.jar"/>
+ <pathelement location="${dir.src}/apps/default/WEB-INF/lib/standard.jar"/>
+ <pathelement location="${dir.libs}/activation.jar"/>
+ <pathelement location="${dir.libs}/mail.jar"/>
+ <pathelement location="${dir.libs}/cvslib.jar"/>
+ <pathelement location="${dir.libs}/j2h.jar"/>
+ <pathelement location="${dir.libs}/picocontainer-1.0.jar"/>
+ <pathelement location="${dir.libs}/nanocontainer-1.0.jar"/>
+ <pathelement location="${dir.libs}/nanocontainer-dynaop-1.0-beta-1-SNAPSHOT.jar"/>
+ <pathelement location="${dir.libs}/jmock-1.0.0.jar"/>
</path>
<path id="all.classpath">
<path id="test.classpath">
<path refid="all.classpath"/>
- <pathelement location="${jar}/junit.jar"/>
+ <pathelement location="${dir.libs}/junit.jar"/>
</path>
<!-- build distribution -->
<include name="lib/javax.servlet.jar"/>
<include name="lib/commons-codec-1.3.jar"/>
<include name="lib/commons-logging.jar"/>
- <include name="lib/httpclient-3.0-rc3.jar"/>
+ <include name="lib/commons-httpclient-3.0-rc3.jar"/>
<include name="lib/javax.servlet.jar"/>
- <include name="lib/xmlrpc-2.0.jar"/>
+ <include name="lib/${xmlrpc.jar}"/>
<include name="lib/mckoidb.jar"/>
<include name="lib/dom4j.jar"/>
<include name="lib/mysql-connector.jar"/>
<!-- delete compiled class files and created jar/war archives -->
<target description="clean up compiled code" name="clean">
<delete failonerror="false" includeEmptyDirs="true">
- <fileset dir="${target}" includes="**" excludes="CVS"/>
+ <fileset dir="${dir.out}" includes="**" excludes="CVS"/>
</delete>
<delete failonerror="false">
- <fileset dir="${jar}" includes="${appname}*.jar"/>
- <fileset dir="${jar}" includes="${appname}*.war"/>
- <fileset dir="${src}/apps/default/WEB-INF/lib" includes="${appname}-servlets.jar"/>
- <fileset dir="${src}/apps/installer/WEB-INF/lib" includes="installer-servlets.jar"/>
- <fileset dir="${src}/org/snipsnap/config" includes="Options.java"/>
+ <fileset dir="${dir.libs}" includes="${appname}*.jar"/>
+ <fileset dir="${dir.libs}" includes="${appname}*.war"/>
+ <fileset dir="${dir.src}/apps/default/WEB-INF/lib" includes="${appname}-servlets.jar"/>
+ <fileset dir="${dir.src}/apps/installer/WEB-INF/lib" includes="installer-servlets.jar"/>
+ <fileset dir="${dir.src}/org/snipsnap/config" includes="Options.java"/>
</delete>
</target>
<target name="buildtask">
- <mkdir dir="${target}/ant"/>
+ <mkdir dir="${dir.out}/ant"/>
<javac deprecation="false" debug="false"
- srcdir="${src}" destdir="${target}/ant">
+ srcdir="${dir.src}" destdir="${dir.out}/ant">
<include name="org/snipsnap/util/PropertyConstantBuilder.java"/>
</javac>
</target>
<target depends="buildtask" name="declaretask">
<taskdef name="constants"
classname="org.snipsnap.util.PropertyConstantBuilder"
- classpath="${target}/ant"/>
+ classpath="${dir.out}/ant"/>
</target>
<!-- prepare special generated classes -->
<target depends="declaretask" name="generate">
<constants
- properties="${src}/org/snipsnap/config/defaults.conf"
- file="${target}/ant/config.stub" prefix="app."
+ properties="${dir.src}/org/snipsnap/config/defaults.conf"
+ file="${dir.out}/ant/config.stub" prefix="app."
/>
- <loadfile property="config-stub" srcfile="${target}/ant/config.stub" failonerror="false"/>
- <copy file="${src}/org/snipsnap/config/Configuration.java.tmpl"
- tofile="${src}/snipsnap/api/config/Configuration.java" filtering="true" overwrite="true">
+ <loadfile property="config-stub" srcfile="${dir.out}/ant/config.stub" failonerror="false"/>
+ <copy file="${dir.src}/org/snipsnap/config/Configuration.java.tmpl"
+ tofile="${dir.src}/snipsnap/api/config/Configuration.java" filtering="true" overwrite="true">
<filterset>
<filter token="DEFAULTS" value="${config-stub}"/>
</filterset>
</copy>
<constants
- properties="${src}/org/snipsnap/config/globals.conf"
- file="${target}/ant/globals.stub" prefix="app."
+ properties="${dir.src}/org/snipsnap/config/globals.conf"
+ file="${dir.out}/ant/globals.stub" prefix="app."
/>
- <loadfile property="globals-stub" srcfile="${target}/ant/globals.stub" failonerror="false"/>
- <copy file="${src}/org/snipsnap/config/Globals.java.tmpl"
- tofile="${src}/org/snipsnap/config/Globals.java" filtering="true" overwrite="true">
+ <loadfile property="globals-stub" srcfile="${dir.out}/ant/globals.stub" failonerror="false"/>
+ <copy file="${dir.src}/org/snipsnap/config/Globals.java.tmpl"
+ tofile="${dir.src}/org/snipsnap/config/Globals.java" filtering="true" overwrite="true">
<filterset>
<filter token="DEFAULTS" value="${globals-stub}"/>
</filterset>
</target>
<target depends="compile-api" description="create api jar" name="jar-api">
- <jar destfile="${jar}/snipsnap-api.jar">
- <fileset dir="${target}/api/" includes="snipsnap/api/**"/>
+ <jar destfile="${dir.libs}/snipsnap-api.jar">
+ <fileset dir="${dir.out}/api/" includes="snipsnap/api/**"/>
</jar>
</target>
<target description="compile api code" name="compile-api">
- <mkdir dir="${target}/api"/>
+ <mkdir dir="${dir.out}/api"/>
<javac deprecation="${deprecation}" debug="${debug}"
- srcdir="${src}"
- destdir="${target}/api"
+ srcdir="${dir.src}"
+ destdir="${dir.out}/api"
classpathref="all.classpath">
<include name="snipsnap/api/**"/>
</target>
<target description="compile implementation code" name="compile-impl">
- <mkdir dir="${target}/impl"/>
+ <mkdir dir="${dir.out}/impl"/>
<javac deprecation="${deprecation}" debug="${debug}"
- srcdir="${src}"
- destdir="${target}/impl"
+ srcdir="${dir.src}"
+ destdir="${dir.out}/impl"
classpathref="all.classpath">
<include name="org/snipsnap/util/ApplicationAwareMap.java"/>
</target>
<target depends="compile-impl" description="create implementation jar" name="jar-impl">
- <jar destfile="${jar}/snipsnap-impl.jar">
- <fileset dir="${target}/impl/" includes="**"/>
+ <jar destfile="${dir.libs}/snipsnap-impl.jar">
+ <fileset dir="${dir.out}/impl/" includes="**"/>
</jar>
</target>
<!-- create server code -->
<target depends="compile-jsp, compile-server,installer-war,snipsnap-war" description="create server jar"
name="jar-server">
- <copy file="conf/copyright.txt" tofile="${target}/server/conf/copyright.txt" filtering="true">
+ <copy file="conf/copyright.txt" tofile="${dir.out}/server/conf/copyright.txt" filtering="true">
<filterset>
<filter token="VERSION" value="${snipsnap.server.version}"/>
</filterset>
</copy>
- <jar destfile="${jar}/${appname}-server.jar" excludes="**/CVS, org/snipsnap/server/*Launcher*"
+ <jar destfile="${dir.libs}/${appname}-server.jar" excludes="**/CVS, org/snipsnap/server/*Launcher*"
manifest="conf/manifest">
- <fileset dir="${target}/server" includes="**">
+ <fileset dir="${dir.out}/server" includes="**">
<exclude name="org/snipsnap/server/*Launcher*"/>
</fileset>
<fileset dir=".">
<include name="conf/snipsnap.conf"/>
<include name="conf/jetty.conf"/>
</fileset>
- <fileset dir="${src}" includes="org/snipsnap/config/globals.conf"/>
- <fileset dir="${src}" includes="org/snipsnap/config/defaults.conf"/>
- <fileset dir="${src}" includes="org/snipsnap/config/transpose.map"/>
+ <fileset dir="${dir.src}" includes="org/snipsnap/config/globals.conf"/>
+ <fileset dir="${dir.src}" includes="org/snipsnap/config/defaults.conf"/>
+ <fileset dir="${dir.src}" includes="org/snipsnap/config/transpose.map"/>
</jar>
- <jar destfile="${jar}/${appname}.jar" excludes="**/CVS" manifest="conf/launcher.manifest">
- <fileset dir="${target}/server" includes="org/snipsnap/server/*Launcher*"/>
- <fileset dir="${jar}">
+ <jar destfile="${dir.libs}/${appname}.jar" excludes="**/CVS" manifest="conf/launcher.manifest">
+ <fileset dir="${dir.out}/server" includes="org/snipsnap/server/*Launcher*"/>
+ <fileset dir="${dir.libs}">
<include name="jdic.jar"/>
<include name="snipsnap-server.jar"/>
<include name="org.mortbay.jetty.jar"/>
<include name="org.apache.jasper.jar"/>
<include name="commons-codec-1.3.jar"/>
<include name="commons-logging.jar"/>
- <include name="httpclient-3.0-rc3.jar"/>
- <include name="xmlrpc-2.0.jar"/>
+ <include name="commons-httpclient-3.0-rc3.jar"/>
+ <include name="${xmlrpc.jar}"/>
<include name="mckoidb.jar"/>
<include name="mysql-connector.jar"/>
<include name="postgres-jdbc.jar"/>
</target>
<target depends="generate" description="compile server code" name="compile-server">
- <mkdir dir="${target}/server"/>
+ <mkdir dir="${dir.out}/server"/>
<javac deprecation="${deprecation}" debug="${debug}"
- srcdir="${src}"
- destdir="${target}/server"
+ srcdir="${dir.src}"
+ destdir="${dir.out}/server"
classpathref="server.classpath">
<include name="org/snipsnap/server/**"/>
<!-- create utility code -->
<target depends="compile-util" description="build util jar" name="jar-util">
- <jar destfile="${jar}/${appname}-utils.jar" excludes="**/CVS" manifest="conf/utils.manifest">
- <fileset dir="${target}/util" includes="**"/>
+ <jar destfile="${dir.libs}/${appname}-utils.jar" excludes="**/CVS" manifest="conf/utils.manifest">
+ <fileset dir="${dir.out}/util" includes="**"/>
<fileset dir="." includes="conf/snipsnap.conf"/>
<fileset dir="." includes="conf/copyright.txt"/>
- <fileset dir="${src}" includes="org/snipsnap/config/defaults.conf"/>
- <fileset dir="${src}" includes="org/snipsnap/config/transpose.map"/>
+ <fileset dir="${dir.src}" includes="org/snipsnap/config/defaults.conf"/>
+ <fileset dir="${dir.src}" includes="org/snipsnap/config/transpose.map"/>
</jar>
</target>
<target depends="generate" description="compile util code" name="compile-util">
- <mkdir dir="${target}/util"/>
+ <mkdir dir="${dir.out}/util"/>
<javac deprecation="${deprecation}" debug="${debug}"
- srcdir="${src}"
+ srcdir="${dir.src}"
classpathref="all.classpath"
- destdir="${target}/util">
+ destdir="${dir.out}/util">
<include name="org/snipsnap/util/Test*"/>
<include name="org/snipsnap/util/*Util.java"/>
<include name="org/snipsnap/util/DB*.java"/>
</target>
<target depends="generate" description="compile test code" name="compile-test">
- <mkdir dir="${target}/test"/>
+ <mkdir dir="${dir.out}/test"/>
<javac deprecation="${deprecation}" debug="${debug}"
- srcdir="${src}"
+ srcdir="${dir.src}"
classpathref="test.classpath"
- destdir="${target}/test"
+ destdir="${dir.out}/test"
includes="org/snipsnap/test/**"/>
</target>
<target depends="generate" description="compile template application code" name="compile-servlets">
- <mkdir dir="${target}/default/WEB-INF/classes"/>
+ <mkdir dir="${dir.out}/default/WEB-INF/classes"/>
<!-- fix, why junit to compile servlets? -->
<javac deprecation="${deprecation}" debug="${debug}"
- srcdir="${src}"
+ srcdir="${dir.src}"
classpathref="test.classpath"
- destdir="${target}/default/WEB-INF/classes"
+ destdir="${dir.out}/default/WEB-INF/classes"
excludes="org/snipsnap/admin/**, org/snipsnap/server/**">
- <src path="${src}"/>
+ <src path="${dir.src}"/>
<include name="org/snipsnap/**"/>
</javac>
</target>
<target depends="compile-servlets" name="servlets-jar">
- <copy todir="${target}/default/WEB-INF/classes" filtering="true" overwrite="true">
+ <copy todir="${dir.out}/default/WEB-INF/classes" filtering="true" overwrite="true">
<filterset>
<filter token="VERSION" value="${snipsnap.server.version}"/>
</filterset>
- <fileset dir="${src}" includes="org/snipsnap/net/dispatcher.conf"/>
- <fileset dir="${src}" includes="org/snipsnap/config/globals.conf"/>
- <fileset dir="${src}" includes="org/snipsnap/config/defaults.conf"/>
- <fileset dir="${src}" includes="org/snipsnap/config/transpose.map"/>
- <fileset dir="${src}" includes="org/snipsnap/snip/storage/SnipSerializer.properties"/>
- <fileset dir="${src}" includes="org/snipsnap/net/handler/*.gsp"/>
+ <fileset dir="${dir.src}" includes="org/snipsnap/net/dispatcher.conf"/>
+ <fileset dir="${dir.src}" includes="org/snipsnap/config/globals.conf"/>
+ <fileset dir="${dir.src}" includes="org/snipsnap/config/defaults.conf"/>
+ <fileset dir="${dir.src}" includes="org/snipsnap/config/transpose.map"/>
+ <fileset dir="${dir.src}" includes="org/snipsnap/snip/storage/SnipSerializer.properties"/>
+ <fileset dir="${dir.src}" includes="org/snipsnap/net/handler/*.gsp"/>
</copy>
- <jar destfile="${src}/apps/default/WEB-INF/lib/snipsnap-servlets.jar" excludes="**/CVS">
- <fileset dir="${target}/default/WEB-INF/classes" includes="**"/>
- <fileset dir="${src}" includes="META-INF/**"/>
+ <jar destfile="${dir.src}/apps/default/WEB-INF/lib/snipsnap-servlets.jar" excludes="**/CVS">
+ <fileset dir="${dir.out}/default/WEB-INF/classes" includes="**"/>
+ <fileset dir="${dir.src}" includes="META-INF/**"/>
<fileset dir="./conf/" includes="gabriel/**"/>
</jar>
</target>
<target if="precompile.jsp" depends="servlets-jar" name="compile-jsp" description="compile jsp files">
- <mkdir dir="${target}/jsp/source"/>
- <mkdir dir="${target}/jsp/classes"/>
- <jspc destdir="${target}/jsp/source"
- verbose="1" srcdir="${src}/apps/default"
+ <mkdir dir="${dir.out}/jsp/source"/>
+ <mkdir dir="${dir.out}/jsp/classes"/>
+ <jspc destdir="${dir.out}/jsp/source"
+ verbose="1" srcdir="${dir.src}/apps/default"
classpathref="all.classpath"
- webinc="${target}/jsp/web.inc">
+ webinc="${dir.out}/jsp/web.inc">
<include name="**/*.jsp"/>
- <webapp basedir="${src}/apps/default"/>
+ <webapp basedir="${dir.src}/apps/default"/>
</jspc>
<depend
- srcdir="${target}/jsp/source"
- destdir="${target}/jsp/classes"
- cache="${target}/jsp/dependencies"
+ srcdir="${dir.out}/jsp/source"
+ destdir="${dir.out}/jsp/classes"
+ cache="${dir.out}/jsp/dependencies"
classpathref="all.classpath"/>
<javac deprecation="${deprecation}" debug="${debug}"
- srcdir="${target}/jsp/source"
- classpath="${src}/apps/default/WEB-INF/lib/snipsnap-servlets.jar"
+ srcdir="${dir.out}/jsp/source"
+ classpath="${dir.src}/apps/default/WEB-INF/lib/snipsnap-servlets.jar"
classpathref="all.classpath"
- destdir="${target}/jsp/classes">
+ destdir="${dir.out}/jsp/classes">
<include name="**"/>
</javac>
</target>
<target name="make-edittest-jsp">
- <mkdir dir="${target}/jsp/source"/>
- <mkdir dir="${target}/jsp/classes"/>
- <jspc destdir="${target}/jsp/source"
- verbose="1" srcdir="${src}"
+ <mkdir dir="${dir.out}/jsp/source"/>
+ <mkdir dir="${dir.out}/jsp/classes"/>
+ <jspc destdir="${dir.out}/jsp/source"
+ verbose="1" srcdir="${dir.src}"
package="org.snipsnap.jsp"
classpathref="all.classpath">
<include name="**/EditTest.jsp"/>
</jspc>
<depend
- srcdir="${target}/jsp/source"
- destdir="${target}/jsp/classes"
- cache="${target}/jsp/dependencies"
+ srcdir="${dir.out}/jsp/source"
+ destdir="${dir.out}/jsp/classes"
+ cache="${dir.out}/jsp/dependencies"
classpathref="all.classpath"/>
<javac deprecation="${deprecation}" debug="${debug}"
- srcdir="${target}/jsp/source"
- classpath="${src}/apps/default/WEB-INF/lib/snipsnap-servlets.jar"
+ srcdir="${dir.out}/jsp/source"
+ classpath="${dir.src}/apps/default/WEB-INF/lib/snipsnap-servlets.jar"
classpathref="all.classpath"
- destdir="${target}/jsp/classes">
+ destdir="${dir.out}/jsp/classes">
<include name="**"/>
</javac>
- <jar destfile="${src}/apps/default/WEB-INF/lib/edittest.jar" excludes="**/CVS">
- <fileset dir="${target}/jsp/classes" includes="**"/>
- <!-- <fileset dir="${src}" includesfile="META-INF/services/javax.servlet.HttpServlet"/> -->
+ <jar destfile="${dir.src}/apps/default/WEB-INF/lib/edittest.jar" excludes="**/CVS">
+ <fileset dir="${dir.out}/jsp/classes" includes="**"/>
+ <!-- <fileset dir="${dir.src}" includesfile="META-INF/services/javax.servlet.HttpServlet"/> -->
</jar>
</target>
<target if="precompile.jsp" depends="compile-jsp" name="jsp-jar" description="package precompiled jsp files">
- <jar destfile="${src}/apps/default/WEB-INF/lib/snipsnap-jsp.jar" excludes="**/CVS">
- <fileset dir="${target}/jsp/classes" includes="**"/>
+ <jar destfile="${dir.src}/apps/default/WEB-INF/lib/snipsnap-jsp.jar" excludes="**/CVS">
+ <fileset dir="${dir.out}/jsp/classes" includes="**"/>
</jar>
</target>
<!-- create web archive of the template application -->
- <target depends="jsp-jar" description="build template war" name="snipsnap-war">
- <mkdir dir="${target}/webapp"/>
- <copy todir="${target}/webapp">
- <fileset dir="${src}/apps/default">
+ <target depends="jsp-jar,jar-api" description="build template war" name="snipsnap-war">
+ <mkdir dir="${dir.out}/webapp"/>
+ <copy todir="${dir.out}/webapp">
+ <fileset dir="${dir.src}/apps/default">
<exclude name="**/CVS"/>
<exclude name="**/*.jsp" if="precompile.jsp"/>
<exclude name="WEB-INF/web-xml.tmpl"/>
</fileset>
</copy>
- <copy tofile="${target}/webapp/WEB-INF/classes/i18n/messages.properties"
- file="${src}/apps/default/WEB-INF/classes/i18n/messages_en.properties"/>
+ <copy tofile="${dir.out}/webapp/WEB-INF/classes/i18n/messages.properties"
+ file="${dir.src}/apps/default/WEB-INF/classes/i18n/messages_en.properties"/>
- <loadfile property="web.inc" srcfile="${target}/jsp/web.inc" failonerror="false"/>
+ <loadfile property="web.inc" srcfile="${dir.out}/jsp/web.inc" failonerror="false"/>
<condition property="web.inc" value="">
<not>
<isset property="${web.inc}"/>
</condition>
<!-- copy with filter if web.inc is available -->
<copy
- tofile="${target}/webapp/WEB-INF/web.xml"
- file="${src}/apps/default/WEB-INF/web-xml.tmpl" overwrite="true">
+ tofile="${dir.out}/webapp/WEB-INF/web.xml"
+ file="${dir.src}/apps/default/WEB-INF/web-xml.tmpl" overwrite="true">
<filterset>
<filter token="VERSION" value="${snipsnap.server.version}"/>
<filter token="PRECOMPILED-JSP" value="${web.inc}"/>
</filterset>
</copy>
- <copy file="${src}/apps/default/index.jsp" tofile="${target}/webapp/index.jsp"/>
+ <copy file="${dir.src}/apps/default/index.jsp" tofile="${dir.out}/webapp/index.jsp"/>
<copy file="conf/copyright.txt" filtering="true"
- todir="${target}/webapp/WEB-INF/classes/defaults">
+ todir="${dir.out}/webapp/WEB-INF/classes/defaults">
<filterset>
<filter token="VERSION" value="${snipsnap.server.version}"/>
</filterset>
</copy>
- <copy todir="${target}/webapp/WEB-INF/lib">
- <fileset dir="${jar}">
+ <copy todir="${dir.out}/webapp/WEB-INF/lib">
+ <fileset dir="${dir.libs}">
<include name="asm-1.4.1.jar"/>
<include name="gabriel.jar"/>
<include name="jmdns.jar"/>
<include name="commons-collections.jar"/>
<include name="lucene-1.4.1.jar"/>
<include name="commons-codec-1.3.jar"/>
- <include name="httpclient-3.0-rc3.jar"/>
- <include name="xmlrpc-2.0.jar"/>
+ <include name="commons-httpclient-3.0-rc3.jar"/>
+ <include name="${xmlrpc.jar}"/>
<include name="dom4j.jar"/>
<include name="smack.jar"/>
<include name="aspectjrt.jar"/>
<include name="rss-ng-1.0-alpha-1.jar"/>
<include name="${search-ng.jar}"/>
<include name="jdbcstorage-1.0-alpha-1.jar"/>
+ <include name="snipsnap-api.jar"/>
</fileset>
</copy>
- <jar destfile="${jar}/${appname}.war">
- <fileset dir="${target}/webapp" includes="**"/>
+ <jar destfile="${dir.libs}/${appname}.war">
+ <fileset dir="${dir.out}/webapp" includes="**"/>
</jar>
</target>
<target if="precompile.jsp" depends="installer-servlets-jar" name="compile-installer-jsp"
description="compile installer jsp files">
- <mkdir dir="${target}/installer/jsp/source"/>
- <mkdir dir="${target}/installer/jsp/classes"/>
- <jspc destdir="${target}/installer/jsp/source"
+ <mkdir dir="${dir.out}/installer/jsp/source"/>
+ <mkdir dir="${dir.out}/installer/jsp/classes"/>
+ <jspc destdir="${dir.out}/installer/jsp/source"
verbose="1"
classpathref="all.classpath"
- webinc="${target}/installer/jsp/web.inc">
+ webinc="${dir.out}/installer/jsp/web.inc">
<include name="**/*.jsp"/>
- <webapp basedir="${src}/apps/installer"/>
+ <webapp basedir="${dir.src}/apps/installer"/>
</jspc>
<depend
- srcdir="${target}/installer/jsp/source"
- destdir="${target}/installer/jsp/classes"
- cache="${target}/installer/jsp/dependencies"
+ srcdir="${dir.out}/installer/jsp/source"
+ destdir="${dir.out}/installer/jsp/classes"
+ cache="${dir.out}/installer/jsp/dependencies"
classpathref="all.classpath"/>
<javac deprecation="${deprecation}" debug="${debug}"
- srcdir="${target}/installer/jsp/source"
- classpath="${target}/installer/webapp/WEB-INF/lib/installer-servlets.jar"
+ srcdir="${dir.out}/installer/jsp/source"
+ classpath="${dir.out}/installer/webapp/WEB-INF/lib/installer-servlets.jar"
classpathref="all.classpath"
- destdir="${target}/installer/jsp/classes">
+ destdir="${dir.out}/installer/jsp/classes">
<include name="**"/>
</javac>
</target>
<target description="compile installer application code" name="compile-installer">
- <mkdir dir="${target}/installer/servlets"/>
+ <mkdir dir="${dir.out}/installer/servlets"/>
<javac deprecation="${deprecation}" debug="${debug}"
- srcdir="${src}"
+ srcdir="${dir.src}"
classpathref="all.classpath"
- destdir="${target}/installer/servlets">
+ destdir="${dir.out}/installer/servlets">
<include name="org/snipsnap/admin/AdminInitFilter.java"/>
<include name="org/snipsnap/admin/Installer.java"/>
</javac>
<target if="precompile.jsp" depends="compile-installer-jsp" name="installer-jsp-jar"
description="package precompiled installer jsp files">
- <mkdir dir="${target}/installer/webapp/WEB-INF/lib"/>
- <jar destfile="${target}/installer/webapp/WEB-INF/lib/installer-jsp.jar" excludes="**/CVS">
- <fileset dir="${target}/installer/jsp/classes" includes="**"/>
+ <mkdir dir="${dir.out}/installer/webapp/WEB-INF/lib"/>
+ <jar destfile="${dir.out}/installer/webapp/WEB-INF/lib/installer-jsp.jar" excludes="**/CVS">
+ <fileset dir="${dir.out}/installer/jsp/classes" includes="**"/>
</jar>
</target>
<target depends="compile-installer" description="package installer servlets" name="installer-servlets-jar">
- <mkdir dir="${target}/installer/webapp/WEB-INF/lib"/>
- <jar destfile="${target}/installer/webapp/WEB-INF/lib/installer-servlets.jar" excludes="**/CVS">
- <fileset dir="${target}/installer/servlets" includes="**"/>
+ <mkdir dir="${dir.out}/installer/webapp/WEB-INF/lib"/>
+ <jar destfile="${dir.out}/installer/webapp/WEB-INF/lib/installer-servlets.jar" excludes="**/CVS">
+ <fileset dir="${dir.out}/installer/servlets" includes="**"/>
<fileset dir="." includes="conf/snipsnap.conf"/>
- <fileset dir="${src}" includes="org/snipsnap/config/defaults.conf"/>
- <fileset dir="${src}" includes="org/snipsnap/config/transpose.conf"/>
+ <fileset dir="${dir.src}" includes="org/snipsnap/config/defaults.conf"/>
+ <fileset dir="${dir.src}" includes="org/snipsnap/config/globals.conf"/>
</jar>
</target>
<!-- create web archive of the installer web application -->
<target depends="installer-jsp-jar" description="build installer war" name="installer-war">
- <mkdir dir="${target}/installer/webapp"/>
- <copy todir="${target}/installer/webapp">
- <fileset dir="${src}/apps/installer">
+ <mkdir dir="${dir.out}/installer/webapp"/>
+ <copy todir="${dir.out}/installer/webapp">
+ <fileset dir="${dir.src}/apps/installer">
<exclude name="**/CVS"/>
<exclude name="**/*.jsp" if="precompile.jsp"/>
<exclude name="WEB-INF/web-xml.tmpl"/>
</fileset>
- <fileset dir="${src}/apps/default">
+ <fileset dir="${dir.src}/apps/default">
<include name="WEB-INF/lib/standard.jar"/>
<include name="WEB-INF/lib/jstl.jar"/>
</fileset>
</copy>
- <copy file="${src}/apps/default/admin/css/config.css" tofile="${target}/installer/webapp/default.css"/>
- <copy file="${src}/apps/installer/index.jsp" tofile="${target}/installer/webapp/index.jsp"/>
+ <copy file="${dir.src}/apps/default/admin/css/config.css" tofile="${dir.out}/installer/webapp/default.css"/>
+ <copy file="${dir.src}/apps/installer/index.jsp" tofile="${dir.out}/installer/webapp/index.jsp"/>
<!-- copy if installer-web.inc is available -->
- <loadfile property="installer-web.inc" srcfile="${target}/installer/jsp/web.inc" failonerror="false"/>
+ <loadfile property="installer-web.inc" srcfile="${dir.out}/installer/jsp/web.inc" failonerror="false"/>
<condition property="installer-web.inc" value="">
<not>
<isset property="${installer-web.inc}"/>
</not>
</condition>
<copy
- tofile="${target}/installer/webapp/WEB-INF/web.xml"
- file="${src}/apps/installer/WEB-INF/web-xml.tmpl" overwrite="true">
+ tofile="${dir.out}/installer/webapp/WEB-INF/web.xml"
+ file="${dir.src}/apps/installer/WEB-INF/web-xml.tmpl" overwrite="true">
<filterset>
<filter token="PRECOMPILED-JSP" value="${installer-web.inc}"/>
</filterset>
</copy>
- <jar destfile="${jar}/${appname}-installer.war">
- <fileset dir="${target}/installer/webapp" includes="**"/>
+ <jar destfile="${dir.libs}/${appname}-installer.war">
+ <fileset dir="${dir.out}/installer/webapp" includes="**"/>
</jar>
</target>
- <target name="prepare-tests">
- <mkdir dir="${target}/test/org/snipsnap/config"/>
- <copy file="conf/snipsnap.conf" tofile="./cls/test/conf/snipsnap.conf"/>
- <copy file="src/org/snipsnap/config/defaults.conf" tofile="${target}/test/org/snipsnap/config/defaults.conf"/>
- <copy file="src/org/snipsnap/config/globals.conf" tofile="${target}/test/org/snipsnap/config/globals.conf"/>
- <copy file="src/org/snipsnap/config/transpose.map" tofile="${target}/test/org/snipsnap/config/transpose.map"/>
- <copy todir="${target}/test">
- <fileset dir="${src}/apps/default" includes="**.properties"/>
- </copy>
+ <import file="build.test.xml"/>
- </target>
-
- <target name="test" depends="snipsnap-war, jar-server, prepare-tests, compile-test">
- <junit printsummary="true">
- <formatter usefile="false" type="plain"/>
- <test name="org.snipsnap.test.AllTests"/>
- <classpath>
- <pathelement location="${target}/test"/>
- <pathelement location="${target}/webapp/WEB-INF/classes"/>
- <path refid="all.classpath"/>
- <path refid="snipsnap.test"/>
- </classpath>
- </junit>
- </target>
-
- <target name="test-complex" depends="snipsnap-war, jar-server, prepare-tests, compile-test">
- <junit printsummary="true">
- <formatter usefile="false" type="plain"/>
- <test name="org.snipsnap.test.AllComplexTests"/>
- <classpath>
- <pathelement location="${target}/test"/>
- <pathelement location="${target}"/>
- <path refid="all.classpath"/>
- </classpath>
- </junit>
- </target>
-
<target description="generation javadocs" name="javadoc">
<javadoc packagenames="org.snipsnap.*"
sourcepath="src"
use="true"
windowtitle="SnipSnap API">
<doctitle><![CDATA[<h1>SnipSnap</h1>]]></doctitle>
- <bottom><![CDATA[<i>Copyright © 2001-2004 Matthias L. Jugel, Stephan J. Schmidt. All Rights Reserved
+ <bottom><![CDATA[<i>Copyright © 2001-2006 Matthias L. Jugel, Stephan J. Schmidt. All Rights Reserved
.</i>]]></bottom>
<!-- <tag name="todo" scope="all" description="To do:" />
<group title="Group 1 Packages" packages="com.dummy.test.a*"/>
<group title="Group 2 Packages" packages="com.dummy.test.b*:com.dummy.test.c*"/>
-->
<link href="http://java.sun.com/j2se/1.4/docs/api/package-list"/>
- <link href="http://java.sun.com/j2ee/1.4/docs/api/package-list"/>
</javadoc>
</target>
blob - /dev/null
blob + a9843d17026dcc2aafcd57623b77e9ebff4f5595 (mode 644)
--- /dev/null
+++ build.launcher.xml
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ** @author Matthias L. Jugel
+ ** @version $Id$
+ -->
+<project basedir="." default="bundle" name="SnipSnap.launcher">
+ <description>
+ Bundle SnipSnap with Application Server launcher.
+ </description>
+
+ <property file="conf/build.properties"/>
+ <property file="conf/libs.properties"/>
+
+ <target name="bundle"
+ description="bundles ${appname}.war and database libs with the launcher">
+ <mkdir dir="${dir.build}"/>
+ <copy file="${dir.libs.snipsnap}/${launcher.jar}" tofile="${dir.build}/${appname}.jar" overwrite="true"/>
+ <jar destfile="${dir.build}/${appname}.jar" excludes="**/CVS,**/.svn" update="true">
+ <fileset dir="${dir.build}" includes="${appname}-installer.war"/>
+ <fileset dir="${dir.build}" includes="${appname}.war"/>
+ <fileset dir="${dir.libs}" includes="${mckoidb.jar}"/>
+ </jar>
+ </target>
+
+</project>
+
blob - 39e95e76eb1cf5320a0b56f03c90a1fce4767049
blob + 58d0daaedbfed810a925f97d190f677ba082b563
--- conf/build.properties
+++ conf/build.properties
precompile.jsp=true
# lib directory containing jar and war files
-jar=${basedir}/lib
+dir.libs=${basedir}/lib
+dir.libs.snipsnap=${basedir}/lib/snipsnap
-# sourcer and target directory for compiled classes
-src=${basedir}/src
-target=${basedir}/cls
+# source and target directory for compiled classes
+dir.src=${basedir}/src
+dir.out=${basedir}/cls
+dir.build=${basedir}/build
check_rules=rulesets/imports.xml,rulesets/braces.xml,rulesets/junit.xml
blob - 9033ca3bbf50b8fbbfbadd95ff0b22c58fc673c3
blob + c2553a52b8690dd1c50ed4321c48799d0d9f148f
--- conf/libs.properties
+++ conf/libs.properties
+# SnipSnap libs and plugins
+launcher.jar=launcher.jar
+
+# database connectors
+mckoidb.jar=mckoidb.jar
+mysql.jar=mysql-connector.jar
+
+# third party libs
rome.jar=rome-0.5.jar
jdom.jar=jdom-1.0.jar
spring-core.jar=spring-core.jar
spring-beans.jar=spring-beans.jar
+xmlrpc.jar=xmlrpc-2.0-beta.jar
+
+# snipsnap plugins
jdbcstorage.jar=jdbcstorage-1.0-alpha-1.jar
search-ng.jar=search-ng-1.0-alpha-1.jar
-rss-ng.jar=rss-ng-1.0-alpha-1.jar
\ No newline at end of file
+rss-ng.jar=rss-ng-1.0-alpha-1.jar
blob - 554f80e4c1cbc259c14d7413d226c937b60497d6
blob + 8ce53f16e83ec994e476521e86ac80e60460efbf
Binary files lib/jdbcstorage-1.0-alpha-1.jar and lib/jdbcstorage-1.0-alpha-1.jar differ
blob - /dev/null
blob + 55069d9922e8ebef78b3b59d8ab2065ae6d6eea2 (mode 644)
Binary files /dev/null and lib/snipsnap/launcher.jar differ
blob - 991edc29a25590de80fa91a382bdc7348134bf62 (mode 644)
blob + /dev/null
Binary files lib/xmlrpc-2.0.jar and /dev/null differ
blob - /dev/null
blob + 86aaa3e99ab2c24815c7d2f27516764862566b63 (mode 644)
Binary files /dev/null and lib/xmlrpc-2.0-beta.jar differ
blob - 33c39728b3bd2ef7bdda7f157c19d4f13042d394
blob + 59f3379f7f0f3f5821bb00444d48196a70253d37
--- src/Changes.txt
+++ src/Changes.txt
-0.5.2
+1.0
+- more componentization
+- extracted JDBC storage plugin
+- extracted RSS feed plugin
+- extracted search engine plugin
+- extracted launcher code
+
+0.5.2
+
- Improvement: Dropped mocking classes for jMock
- Created new sub project Gabriel for security with ACLs and interceptors
- Removed last traces of our AOP solution, replaced with Dynaop
blob - eb704d5dbd1175dada54f28c48628a037feba66f
blob + 075026a8a8d8a26ef9318b892406ce197938e758
--- src/Todo.txt
+++ src/Todo.txt
-@TODO: Add Timezone, e.g. +1.00 to Appconfiguration. Needed e.g. for RSS, DublinCore.
@TODO: Snip with list version of all external libs, like Lucene, ORO, xml parser, ...
@TODO: markup/highlighting for snipsnap macros
blob - 1c2cddbdf5d50d32ab622ca3d8e72a046f178e90
blob + 1d151cb35ddac76ef079d7be078a21569f859c92
--- src/apps/default/edit.jsp
+++ src/apps/default/edit.jsp
-<%@ page import="org.radeox.util.Encoder"%>
<%--
** Template for editing Snips.
** @author Matthias L. Jugel
<c:if test="${error == 'snip.name.empty'}"><span class="error"><fmt:message key="snip.name.empty"/></span></c:if>
</td>
</tr>
- </div>
+ </table>
</c:if>
<table>
<tr><td>
blob - 1f7f619447d6612efb0f60537e05366024f7ec55
blob + 00092c4649f107f35411b7e1c72df586cdd0cbf5
--- src/org/snipsnap/admin/AdminInitFilter.java
+++ src/org/snipsnap/admin/AdminInitFilter.java
package org.snipsnap.admin;
import org.apache.xmlrpc.XmlRpcException;
-import snipsnap.api.config.Configuration;
import org.snipsnap.config.ServerConfiguration;
import org.snipsnap.net.filter.EncRequestWrapper;
import org.snipsnap.server.AdminXmlRpcClient;
+import snipsnap.api.config.Configuration;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import java.util.prefs.Preferences;
public class AdminInitFilter implements Filter {
protected final static String PARAM_INSTALL = "install";
protected final static String PARAM_EXPERT = "expert";
- protected Properties serverPrefsDefaults = new Properties();
+ protected Properties serverConf = new Properties();
protected AdminXmlRpcClient adminClient;
public void init(FilterConfig config) throws ServletException {
- // load defaults (should not be necessary ...)
+ serverConf = (Properties) config.getServletContext().getAttribute("server.config");
try {
- serverPrefsDefaults.load(AdminInitFilter.class.getResourceAsStream("/conf/snipsnap.conf"));
- } catch (IOException e) {
- System.err.println("AdminInitFilter: Unable to read server defaults: " + e.getMessage());
- e.printStackTrace();
- }
-
- Preferences serverPrefs = Preferences.userNodeForPackage(ServerConfiguration.class);
- try {
- String url = serverPrefs.get(ServerConfiguration.ADMIN_URL,
- serverPrefsDefaults.getProperty(ServerConfiguration.ADMIN_URL));
- String user = serverPrefs.get(ServerConfiguration.ADMIN_USER, "admin");
- String pass = serverPrefs.get(ServerConfiguration.ADMIN_PASS, null);
+ String url = (String) serverConf.get("snipsnap.server.admin.rpc.url");
+ String user = (String) serverConf.get("snipsnap.server.admin.user");
+ String pass = (String) serverConf.get("snipsnap.server.admin.password");
adminClient = new AdminXmlRpcClient(url, user, pass);
} catch (Exception e) {
System.out.println("!! Unable to create XML-RPC client, check system preferences:");
// check authentication and verify session
if (!"true".equals(session.getAttribute(ATT_AUTHENTICATED))) {
- Preferences serverPrefs = Preferences.userNodeForPackage(ServerConfiguration.class);
- String serverPass = serverPrefs.get(ServerConfiguration.ADMIN_PASS, "");
+ String serverPass = (String) serverConf.get(ServerConfiguration.ADMIN_PASS);
String installPass = path;
- if (installPass == null || "".equals(installPass) || "/".equals(installPass)) {
+ if ("".equals(installPass) || "/".equals(installPass)) {
installPass = "/" + request.getParameter("password");
}
- if (installPass == null || "".equals(installPass) || !serverPass.equals(installPass.substring(1))) {
+ if ("".equals(installPass) || !serverPass.equals(installPass.substring(1))) {
step = "login";
} else {
session.setAttribute(ATT_AUTHENTICATED, "true");
}
if (null != request.getParameter(PARAM_EXPERT) ||
- (null == request.getParameter(PARAM_INSTALL) && (applications != null && applications.size() > 0))) {
+ (null == request.getParameter(PARAM_INSTALL) && (applications != null && applications.size() > 0))) {
step = "install";
} else {
- URL url = null;
+ URL url;
try {
url = install(config.getProperty(Configuration.APP_HOST),
- config.getProperty(Configuration.APP_PORT),
- config.getProperty(Configuration.APP_PATH));
+ config.getProperty(Configuration.APP_PORT),
+ config.getProperty(Configuration.APP_PATH));
if (url != null) {
((HttpServletResponse) response).sendRedirect(url.toString());
session.removeAttribute(ATT_CONFIG);
blob - c5c685aa054df3649f9fe4469459285ffc540bc2
blob + 7c3bc9e0c42c39d3c681e3bdf1d80916bdce181d
--- src/org/snipsnap/net/filter/InitFilter.java
+++ src/org/snipsnap/net/filter/InitFilter.java
configParam = context.getRealPath("/WEB-INF/application.conf");
}
-
// create globals configuration by getting an instance and loading application.conf
globals = ConfigurationProxy.getInstance();
try {
blob - e90b29fcf284b635a0dc5e86a8d3820dd79c8343
blob + a12a5c50842c44473b5956d08650e5cb771cfe30
--- src/org/snipsnap/server/AdminXmlRpcClient.java
+++ src/org/snipsnap/server/AdminXmlRpcClient.java
*/
package org.snipsnap.server;
+import org.apache.xmlrpc.DefaultXmlRpcTransport;
import org.apache.xmlrpc.XmlRpcClient;
+import org.apache.xmlrpc.XmlRpcClientRequest;
import org.apache.xmlrpc.XmlRpcException;
+import org.apache.xmlrpc.XmlRpcRequest;
+import org.apache.xmlrpc.XmlRpcTransport;
import java.io.IOException;
import java.net.MalformedURLException;
public class AdminXmlRpcClient {
protected XmlRpcClient xmlRpcClient = null;
+ private DefaultXmlRpcTransport xmlRpcTransport = null;
public AdminXmlRpcClient(String url, String user, String password) throws MalformedURLException {
this(new URL(url), user, password);
public AdminXmlRpcClient(URL url, String user, String password) throws MalformedURLException {
URL xmlRpcUrl = new URL(url, "RPC2");
xmlRpcClient = new XmlRpcClient(xmlRpcUrl);
- xmlRpcClient.setBasicAuthentication(user != null ? user : "admin", password != null ? password : "");
+ xmlRpcTransport = new DefaultXmlRpcTransport(xmlRpcUrl);
+ xmlRpcTransport.setBasicAuthentication(user != null ? user : "admin", password != null ? password : "");
}
public Object execute(String method, Vector args) throws XmlRpcException, IOException {
- return xmlRpcClient.execute(method, args);
+ return xmlRpcClient.execute(new XmlRpcRequest(method, args), xmlRpcTransport);
}
public Hashtable getApplications() throws XmlRpcException, IOException {
blob - 309abf051a1cd0843cce3af7144adebcc0fe4b86
blob + 65b3dac53e39bb8ca097d12e8c256377842d9339
--- src/snipsnap/api/config/Configuration.java
+++ src/snipsnap/api/config/Configuration.java
/**
* Interface template for easy usage of the configuration.
* @author Matthias L. Jugel
- * @version $Id: Configuration.java.tmpl 1606 2004-05-17 10:56:18Z leo $
+ * @version $Id: Configuration.java.tmpl 1846 2006-02-07 21:08:46Z leo $
*/
public interface Configuration extends Globals {
public final static String SNIPSNAP_CONFIG = "SnipSnap/config";
// automatically created interface/constants stub from
// /Users/leo/src/Projects/SnipSnap/core/trunk/src/org/snipsnap/config/defaults.conf
- // generated on 2/7/06 9:58 PM
+ // generated on 3/8/06 10:51 AM
// constant/getter for 'app.admin.email'
public final static String APP_ADMIN_EMAIL = "app.admin.email";
public String getAdminEmail();
