You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by si...@apache.org on 2006/12/13 20:04:25 UTC
svn commit: r486798 - in /lucene/java/trunk/contrib/gdata-server: ./
gdata-build/ src/core/ src/core/java/ src/core/src/ src/core/src/java/
src/core/src/java/org/ src/core/src/test/ src/core/src/test/org/
src/core/test/ src/gom/ src/gom/java/ src/gom/s...
Author: simonw
Date: Wed Dec 13 11:04:23 2006
New Revision: 486798
URL: http://svn.apache.org/viewvc?view=rev&rev=486798
Log:
created internal "subproject" structure to reuse the common-build.xml ant tasks
Added:
lucene/java/trunk/contrib/gdata-server/src/core/build.xml
lucene/java/trunk/contrib/gdata-server/src/core/src/
lucene/java/trunk/contrib/gdata-server/src/core/src/java/
- copied from r486628, lucene/java/trunk/contrib/gdata-server/src/core/java/
lucene/java/trunk/contrib/gdata-server/src/core/src/java/org/
- copied from r486795, lucene/java/trunk/contrib/gdata-server/src/core/java/org/
lucene/java/trunk/contrib/gdata-server/src/core/src/test/
- copied from r486628, lucene/java/trunk/contrib/gdata-server/src/core/test/
lucene/java/trunk/contrib/gdata-server/src/core/src/test/gdata-account.xsd
- copied unchanged from r486795, lucene/java/trunk/contrib/gdata-server/src/core/test/gdata-account.xsd
lucene/java/trunk/contrib/gdata-server/src/core/src/test/gdata-config.xml
- copied unchanged from r486795, lucene/java/trunk/contrib/gdata-server/src/core/test/gdata-config.xml
lucene/java/trunk/contrib/gdata-server/src/core/src/test/lucenestorage.properties.xml
- copied unchanged from r486795, lucene/java/trunk/contrib/gdata-server/src/core/test/lucenestorage.properties.xml
lucene/java/trunk/contrib/gdata-server/src/core/src/test/org/
- copied from r486795, lucene/java/trunk/contrib/gdata-server/src/core/test/org/
lucene/java/trunk/contrib/gdata-server/src/gom/build.xml
lucene/java/trunk/contrib/gdata-server/src/gom/src/
lucene/java/trunk/contrib/gdata-server/src/gom/src/java/
- copied from r486628, lucene/java/trunk/contrib/gdata-server/src/gom/java/
lucene/java/trunk/contrib/gdata-server/src/gom/src/java/org/
- copied from r486795, lucene/java/trunk/contrib/gdata-server/src/gom/java/org/
lucene/java/trunk/contrib/gdata-server/src/gom/src/test/
- copied from r486628, lucene/java/trunk/contrib/gdata-server/src/gom/test/
lucene/java/trunk/contrib/gdata-server/src/gom/src/test/org/
- copied from r486795, lucene/java/trunk/contrib/gdata-server/src/gom/test/org/
lucene/java/trunk/contrib/gdata-server/src/hivemind/build.xml
lucene/java/trunk/contrib/gdata-server/src/hivemind/src/
lucene/java/trunk/contrib/gdata-server/src/hivemind/src/java/
- copied from r486628, lucene/java/trunk/contrib/gdata-server/src/hivemind/java/
lucene/java/trunk/contrib/gdata-server/src/hivemind/src/java/org/
- copied from r486795, lucene/java/trunk/contrib/gdata-server/src/hivemind/java/org/
lucene/java/trunk/contrib/gdata-server/src/hivemind/src/test/
- copied from r486628, lucene/java/trunk/contrib/gdata-server/src/hivemind/test/
lucene/java/trunk/contrib/gdata-server/src/hivemind/src/test/org/
- copied from r486795, lucene/java/trunk/contrib/gdata-server/src/hivemind/test/org/
Removed:
lucene/java/trunk/contrib/gdata-server/gdata-build/gom-build.xml
lucene/java/trunk/contrib/gdata-server/gdata-build/hivemind-build.xml
lucene/java/trunk/contrib/gdata-server/gdata-build/ioc-container.xml
lucene/java/trunk/contrib/gdata-server/src/core/java/
lucene/java/trunk/contrib/gdata-server/src/core/test/
lucene/java/trunk/contrib/gdata-server/src/gom/java/
lucene/java/trunk/contrib/gdata-server/src/gom/test/
lucene/java/trunk/contrib/gdata-server/src/hivemind/java/
lucene/java/trunk/contrib/gdata-server/src/hivemind/test/
Modified:
lucene/java/trunk/contrib/gdata-server/build.xml
Modified: lucene/java/trunk/contrib/gdata-server/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/gdata-server/build.xml?view=diff&rev=486798&r1=486797&r2=486798
==============================================================================
--- lucene/java/trunk/contrib/gdata-server/build.xml (original)
+++ lucene/java/trunk/contrib/gdata-server/build.xml Wed Dec 13 11:04:23 2006
@@ -17,40 +17,51 @@
-->
-<project name="gdata-server" default="default">
+<project name="gdata-server" default="compile-core">
<description>
Serverside Google Data API implementation
</description>
<import file="gdata-build/get-dependencies.xml" />
- <import file="gdata-build/ioc-container.xml" />
- <import file="gdata-build/gom-build.xml" />
<property name="javac.source" value="1.5" />
<property name="javac.target" value="1.5" />
- <property name="gdata.war.name" value="gdata-server" />
+
<property name="gdata.lib.dir" value="lib" />
<property name="gdata.external.lib.dir" value="./ext-libs" />
- <property name="db4o.jar" value="db4o-5.2-java5.jar" />
+ <property name="db4o.jar" value="db4o-5.5-java5.jar" />
+ <!-- properties for war task -->
+ <property name="ioc.descriptors.dir" value="./src/hivemind/descriptor" />
+ <property name="ioc.descriptors.excludes" value="" />
+ <property name="ioc.descriptors.includes" value="**/*.xml" />
+
+ <property name="gdata.war.name" value="gdata-server" />
+
+ <property name="jar.name.core" value="lucene-core-${version}" />
+ <property name="jar.name.gom" value="lucene-gom-${version}" />
+ <property name="jar.name.hivemind" value="lucene-hivemind-${version}" />
+
+ <fileset id="hivemind.jars" dir="${gdata.external.lib.dir}">
+ <include name="hivemind-1.1.jar" />
+ <include name="hivemind-jmx-1.1.jar" />
+ <include name="hivemind-lib-1.1.jar" />
+ <include name="javassist-3.0.jar" />
+ <include name="oro-2.0.6.jar" />
+ <include name="hessian-3.0.20.jar" />
+ </fileset>
+
+ <fileset id="gom.jars" dir="${gdata.external.lib.dir}">
+ <include name="stax-1.1.2-dev.jar" />
+ <include name="stax-api-1.0.1.jar" />
+ </fileset>
+
+
<!-- set property for third party jars -->
- <available property="db4o.jar.present" type="file" file="${gdata.lib.dir}/${db4o.jar}" value="test" />
+ <available property="db4o.jar.present" type="file" file="${gdata.external.lib.dir}/${db4o.jar}" value="test" />
<condition property="junit.excludes" value="**/db4o/**/*.java">
<not>
<isset property="db4o.jar.present" />
</not>
</condition>
- <path id="additional.dependencies">
- <fileset dir="${gdata.lib.dir}">
- <include name="servlet-api.jar" />
- <include name="commons-logging-1.1.jar" />
- <include name="gdata-client-1.0.jar" />
- <include name="commons-digester-1.7.jar" />
- <include name="commons-beanutils.jar" />
- <include name="commons-collections-3.2.jar" />
- <include name="nekohtml.jar" />
- <include name="xercesImpl.jar" />
- <include name="${db4o.jar}" if="db4o.jar.present" />
- </fileset>
- </path>
-
+
<condition property="do.download">
<not>
<and>
@@ -65,74 +76,40 @@
</and>
</not>
</condition>
+ <target name="jar-core" description="Packages the JAR file">
+ <ant dir="src/core" target="jar-core" inheritRefs="true" />
+ <ant dir="src/hivemind" target="jar-core" inheritRefs="true" />
+ <ant dir="src/gom" target="jar-core" inheritRefs="true" />
+ </target>
- <!-- redefine compile-core and compile-test to exclude 3rd party dependend sources -->
- <target name="compile-core" depends="init, download">
- <echo>Use gdata - compile-core task </echo>
- <compile srcdir="src/core/java" destdir="${build.dir}/classes/java">
- <classpath>
- <path refid="classpath"/>
- <path refid="build.path"/>
- </classpath>
- <exclude name="org/apache/lucene/gdata/storage/db4o/**" unless="db4o.jar.present" />
- </compile>
- <antcall target="compile-IoC-container"/>
- <antcall target="compile-gom"/>
+ <target name="test">
+ <ant dir="src/core" target="test" inheritRefs="true" />
+ <ant dir="src/gom" target="test" inheritRefs="true" />
+ <ant dir="src/hivemind" target="test" inheritRefs="true" />
+ </target>
+
+ <target name="compile-core" depends="download">
+ <ant dir="src/core" target="compile-core" inheritRefs="true" />
+ <ant dir="src/hivemind" target="compile-core" inheritRefs="true" />
+ <ant dir="src/gom" target="compile-core" inheritRefs="true" />
</target>
<target name="compile-test" depends="compile-core, download">
- <echo>Use gdata - compile-test task </echo>
- <compile srcdir="src/core/test" destdir="${build.dir}/classes/test">
- <classpath>
- <path refid="test.build.path"/>
- <path refid="test.classpath"/>
- </classpath>
- <exclude name="org/apache/lucene/gdata/storage/db4o/**" unless="db4o.jar.present" />
- </compile>
- <copy todir="${build.dir}/classes/core/test">
- <fileset dir="src/test" excludes="**/*.java" />
- </copy>
- <antcall target="compile-IoC-container-test"/>
- <antcall target="compile-gom-test"/>
- </target>
-
- <pathconvert property="project.classpath" targetos="unix" refid="additional.dependencies" />
- <import file="../contrib-build.xml" />
-
- <target name="prepare-dist" depends="jar-core,jar-IoC-container,jar-gom">
- <echo>Prepare dist directory</echo>
- <delete dir="${dist.dir}" />
- <mkdir dir="${dist.dir}" />
- </target>
-
- <target name="war-gdata" depends="prepare-dist,download">
- <echo>Distributing GData War </echo>
- <war destfile="${dist.dir}/${gdata.war.name}.war" webxml="webroot/WEB-INF/web.xml">
- <metainf dir="webroot/meta-inf" />
- <fileset dir="webroot" defaultexcludes="true">
- <exclude name="meta-inf/context.xml" />
- <exclude name="meta-inf/" />
- <exclude name="WEB-INF/web.xml" />
- </fileset>
- <fileset dir="${ioc.descriptors.dir}" excludes="${ioc.descriptors.excludes}" includes="${ioc.descriptors.includes}"/>
- <lib dir="${gdata.lib.dir}">
- <include name="commons-logging-1.1.jar" />
- <include name="gdata-client-1.0.jar" />
- <include name="commons-digester-1.7.jar" />
- <include name="commons-beanutils.jar" />
- <include name="commons-collections-3.2.jar" />
- <include name="nekohtml.jar" />
- <include name="xercesImpl.jar" />
- <include name="${db4o.jar}" if="db4o.jar.present" />
- </lib>
- <lib refid="ioc-container-jars"/>
- <lib refid="gom-jars"/>
- <lib dir="${build.dir}" includes="${final.name}.jar" />
- <lib dir="${build.dir}" includes="${final.name}${ioc.container.jar.suffix}" />
- <lib dir="${build.dir}" includes="${final.name}${gom.jar.suffix}" />
- <lib file="${lucene.jar}" />
- </war>
+ <ant dir="src/core" target="compile-test" inheritRefs="true" />
+ <ant dir="src/hivemind" target="compile-test" inheritRefs="true" />
+ <ant dir="src/gom" target="compile-test" inheritRefs="true" />
+ </target>
+
+ <target name="clean">
+ <ant dir="src/core" target="clean" inheritRefs="true" />
+ <ant dir="src/hivemind" target="clean" inheritRefs="true" />
+ <ant dir="src/gom" target="clean" inheritRefs="true" />
+ </target>
+
+ <target name="war-gdata" depends="clean,jar-core">
+ <ant dir="src/core" target="war-gdata" inheritRefs="true" />
</target>
+
</project>
Added: lucene/java/trunk/contrib/gdata-server/src/core/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/gdata-server/src/core/build.xml?view=auto&rev=486798
==============================================================================
--- lucene/java/trunk/contrib/gdata-server/src/core/build.xml (added)
+++ lucene/java/trunk/contrib/gdata-server/src/core/build.xml Wed Dec 13 11:04:23 2006
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+
+-->
+<project name="gdata-core" default="default">
+
+ <description>
+ Lucene gdata server core build file
+ </description>
+
+ <path id="additional.dependencies">
+ <fileset dir="../../${gdata.lib.dir}">
+ <include name="servlet-api.jar" />
+ <include name="commons-logging-1.1.jar" />
+ <include name="gdata-client-1.0.jar" />
+ <include name="commons-digester-1.7.jar" />
+ <include name="commons-beanutils.jar" />
+ <include name="commons-collections-3.2.jar" />
+ <include name="nekohtml.jar" />
+ <include name="xercesImpl.jar" />
+ </fileset>
+ <fileset dir="../../${gdata.external.lib.dir}">
+ <include name="easymock-1.2_Java1.5.jar" />
+ <include name="${db4o.jar}" if="db4o.jar.present" />
+ </fileset>
+ </path>
+ <property name="build.dir" location="../../../build/contrib/gdata-server/core" />
+ <property name="dist.dir" location="../../../dist/contrib/gdata-server/core" />
+
+ <pathconvert property="project.classpath" targetos="unix" refid="additional.dependencies" />
+ <import file="../../../contrib-build.xml" />
+
+
+
+ <target name="war-gdata" depends="jar-core">
+ <echo>Distributing GData War </echo>
+ <war destfile="${build.dir}/${gdata.war.name}.war" webxml="../../webroot/WEB-INF/web.xml">
+ <metainf dir="../../webroot/meta-inf" />
+ <fileset dir="../../webroot" defaultexcludes="true">
+ <exclude name="meta-inf/context.xml" />
+ <exclude name="meta-inf/" />
+ <exclude name="WEB-INF/web.xml" />
+ </fileset>
+ <fileset dir="../../${ioc.descriptors.dir}" excludes="${ioc.descriptors.excludes}" includes="${ioc.descriptors.includes}" />
+ <lib dir="../../${gdata.lib.dir}">
+ <include name="commons-logging-1.1.jar" />
+ <include name="gdata-client-1.0.jar" />
+ <include name="commons-digester-1.7.jar" />
+ <include name="commons-beanutils.jar" />
+ <include name="commons-collections-3.2.jar" />
+ <include name="nekohtml.jar" />
+ <include name="xercesImpl.jar" />
+ <include name="${db4o.jar}" if="db4o.jar.present" />
+ </lib>
+ <lib refid="hivemind.jars" />
+ <lib refid="gom.jars" />
+ <lib dir="${build.dir}" includes="${jar.name.core}.jar" />
+ <lib dir="${build.dir}/../gom" includes="${jar.name.gom}.jar" />
+ <lib dir="${build.dir}/../hivemind" includes="${jar.name.hivemind}.jar" />
+ <lib file="${lucene.jar}" />
+ </war>
+ </target>
+
+</project>
Added: lucene/java/trunk/contrib/gdata-server/src/gom/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/gdata-server/src/gom/build.xml?view=auto&rev=486798
==============================================================================
--- lucene/java/trunk/contrib/gdata-server/src/gom/build.xml (added)
+++ lucene/java/trunk/contrib/gdata-server/src/gom/build.xml Wed Dec 13 11:04:23 2006
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+
+-->
+<project name="gdata-gom" default="default">
+
+ <description>
+ Lucene gdata server GData Object Model build file
+ </description>
+ <path id="additional.dependencies">
+ <fileset dir="../../${gdata.external.lib.dir}">
+ <include name="stax-1.1.2-dev.jar" />
+ <include name="stax-api-1.0.1.jar" />
+ </fileset>
+ </path>
+ <property name="build.dir" location="../../../build/contrib/gdata-server/gom" />
+ <property name="dist.dir" location="../../../dist/contrib/gdata-server/gom" />
+ <pathconvert property="project.classpath" targetos="unix" refid="additional.dependencies" />
+ <import file="../../../contrib-build.xml" />
+</project>
Added: lucene/java/trunk/contrib/gdata-server/src/hivemind/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/gdata-server/src/hivemind/build.xml?view=auto&rev=486798
==============================================================================
--- lucene/java/trunk/contrib/gdata-server/src/hivemind/build.xml (added)
+++ lucene/java/trunk/contrib/gdata-server/src/hivemind/build.xml Wed Dec 13 11:04:23 2006
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+
+-->
+<project name="hivemind" default="default">
+
+ <description>
+ Lucene gdata server hivemind sources build file
+ </description>
+ <path id="additional.dependencies">
+ <fileset dir="../../${gdata.lib.dir}">
+ <include name="servlet-api.jar" />
+ <include name="commons-logging-1.1.jar" />
+ </fileset>
+ <fileset dir="../../${gdata.external.lib.dir}">
+ <include name="easymock-1.2_Java1.5.jar" />
+ <include name="hivemind-1.1.jar" />
+ <include name="hivemind-lib-1.1.jar" />
+ <include name="hivemind-jmx-1.1.jar" />
+ <include name="hessian-3.0.20.jar" />
+ </fileset>
+ </path>
+ <pathconvert property="project.classpath" targetos="unix" refid="additional.dependencies" />
+
+ <property name="build.dir" location="../../../build/contrib/gdata-server/hivemind" />
+ <property name="dist.dir" location="../../../dist/contrib/gdata-server/hivemind" />
+ <import file="../../../contrib-build.xml" />
+</project>